John W. Linville 5c01d56693 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/wl12xx/wl1271_main.c		2010-04-15 16:21:34 -04:00
..
card.h	sdio: add quirk to clamp byte mode transfer	2010-03-06 11:26:36 -08:00
core.h	mmc: allow host claim / release nesting	2009-09-23 07:39:33 -07:00
host.h	sdio: introduce API for special power management features	2010-03-06 11:26:36 -08:00
mmc.h	mmc: fix incorrect interpretation of card type bits	2010-03-24 16:31:21 -07:00
pm.h	sdio: introduce API for special power management features	2010-03-06 11:26:36 -08:00
sd.h
sdio.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
sdio_func.h	sdio: introduce API for special power management features	2010-03-06 11:26:36 -08: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