Colin Cross 98959c8563 Merge branch 'android-2.6.36' into android-tegra-2.6.36 ... Conflicts: drivers/input/touchscreen/Kconfig Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02		2010-10-06 16:32:09 -07:00
..
card.h	mmc: add erase, secure erase, trim and secure trim operations	2010-08-12 08:43:30 -07:00
core.h	mmc: add erase, secure erase, trim and secure trim operations	2010-08-12 08:43:30 -07:00
host.h	Merge branch 'android-2.6.36' into android-tegra-2.6.36	2010-10-06 16:32:09 -07:00
mmc.h	Merge branch 'android-2.6.36' into android-tegra-2.6.36	2010-10-06 16:32:09 -07:00
pm.h	sdio: introduce API for special power management features	2010-03-06 11:26:36 -08:00
sd.h	mmc: add erase, secure erase, trim and secure trim operations	2010-08-12 08:43:30 -07:00
sdhci-spear.h	sdhci-spear: ST SPEAr based SDHCI controller glue	2010-05-27 09:12:40 -07:00
sdio_func.h	trout: Add functions for WiFi	2010-09-29 17:49:13 -07:00
sdio_ids.h	wimax/iwmc3200: add new sdio device ID to support iwmc3200 2.5GHz sku	2009-10-19 15:55:59 +09:00
sdio.h	mmc: avoid getting CID on SDIO-only cards	2010-09-09 18:57:22 -07:00
sh_mmcif.h	sh: add boot code to MMCIF driver header	2010-05-31 13:11:47 +09:00