tree fa43345288d7b25fac92b3b35360a177c4947313
parent fea069152614cdeefba4b2bf80afcddb9c217fc8
parent a5e944f1d955f3819503348426763e21e0413ba6
author John W. Linville <linville@tuxdriver.com> 1271362894 -0400
committer John W. Linville <linville@tuxdriver.com> 1271362894 -0400

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