linux-uconsole/include/linux/mmc
黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c
2011-06-16 11:56:59 +08:00
..
card.h update sdmmc drivers and conifg:'Enable paranoid SD card initialization' 2011-04-09 12:49:28 +08:00
core.h mmc: allow host claim / release nesting 2009-09-23 07:39:33 -07:00
host.h Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
mmc.h mmc: check status after MMC SWITCH command 2009-09-23 07:39:34 -07:00
sd.h
sdio.h libertas/sdio: 8686: set ECSI bit for 1-bit transfers 2010-08-02 10:21:25 -07:00
sdio_func.h trout: Add functions for WiFi 2010-02-08 15:07:54 -08:00
sdio_ids.h imwc3200: move iwmc3200 SDIO ids to sdio_ids.h 2009-07-26 19:25:47 -07:00