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

..

bus.c

mmc: implement SD-combo (IO+mem) support

2010-08-11 08:59:03 -07:00

bus.h

mmc: use sysfs groups to handle conditional attributes

2008-03-22 17:02:20 -07:00

core.c

mmc: core: Release delayed mmc work wakelock after deep disable

2010-09-29 17:49:27 -07:00

core.h

mmc: add erase, secure erase, trim and secure trim operations

2010-08-12 08:43:30 -07:00

debugfs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

host.c

mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y

2010-08-18 09:34:05 -07:00

host.h

mmc: add 'enable' and 'disable' methods to mmc host

2009-09-23 07:39:33 -07:00

Kconfig

mmc: Add concept of an 'embedded' SDIO device.

2010-09-29 17:49:13 -07:00

Makefile

mmc: Export internal host state through debugfs

2008-07-27 01:26:16 +02:00

mmc_ops.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mmc_ops.h

mmc: add mmc card sleep and awake support

2009-09-23 07:39:33 -07:00

mmc.c

mmc: fix non-arm build due to eMMC 4.3+ change

2010-10-06 16:28:10 -07:00

sd_ops.c

mmc: add erase, secure erase, trim and secure trim operations

2010-08-12 08:43:30 -07:00

sd_ops.h

mmc: add erase, secure erase, trim and secure trim operations

2010-08-12 08:43:30 -07:00

sd.c

mmc: sd: Add retries in re-detection

2010-09-29 17:49:14 -07:00

sd.h

mmc: split mmc_sd_init_card()

2010-08-11 08:59:02 -07:00

sdio_bus.c

mmc: Add concept of an 'embedded' SDIO device.

2010-09-29 17:49:13 -07:00

sdio_bus.h

mmc: basic SDIO device model

2007-09-23 19:45:31 +02:00

sdio_cis.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sdio_cis.h

sdio: split up common and function CIS parsing

2007-09-23 20:44:22 +02:00

sdio_io.c

trout: Add functions for WiFi

2010-09-29 17:49:13 -07:00

sdio_irq.c

sdio: give sdio irq thread a host specific name

2008-10-12 11:04:30 +02:00

sdio_ops.c

sdio: recognize io card without powercycle

2010-03-12 15:52:28 -08:00

sdio_ops.h

sdio: recognize io card without powercycle

2010-03-12 15:52:28 -08:00

sdio.c

Merge branch 'android-2.6.36' into android-tegra-2.6.36

2010-10-06 16:32:09 -07:00