黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ... Conflicts: drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/libertas/if_sdio1.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2010-12-16 20:54:24 +08:00
..
card.h	sdio: add MMC_QUIRK_LENIENT_FN0	2009-09-23 07:39:37 -07:00
core.h	mmc: allow host claim / release nesting	2009-09-23 07:39:33 -07:00
host.h	mmc: core: Add deferred bus resume policy.	2010-02-08 15:08:29 -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