David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig

2009-11-18 22:19:03 -08:00

..

card.h

sdio: add MMC_QUIRK_LENIENT_FN0

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

core.h

…

host.h

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

mmc.h

mmc: check status after MMC SWITCH command

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

sd.h

…

sdio_func.h

mmc: make SDIO device/driver struct accessors public

2009-09-23 07:39:38 -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

…