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

…

core.h

…

host.h

…

mmc.h

mmc: fix incorrect interpretation of card type bits

2010-03-24 16:31:21 -07:00

pm.h

…

sd.h

…

sdio_func.h

…

sdio_ids.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