Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Feb 2011 20:10:22 +0000 (15:10 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Feb 2011 20:10:22 +0000 (15:10 -0500)
commit5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce
treeb5e5787a6d5c15e589d275c7434ebbf341257234
parentdb62983a1e4b2af9e79c97af768f0c8b80bd93f0
parent320d6c1b56de5f461c6062625b9664095f90ee95
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
Documentation/feature-removal-schedule.txt
MAINTAINERS
net/mac80211/Kconfig