Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 2 Sep 2010 17:30:07 +0000 (13:30 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 2 Sep 2010 17:30:07 +0000 (13:30 -0400)
commit78ab952717b62c0ba6ca7f7a27eaa0486685e45f
treea4ab2bfc578f279fc6847031f501d84c75057531
parent3e502e63586920f219ed2590f69c1f5a8888cfa4
parent85f72bc839705294b32b6c16b491c0422f0a71b3
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
12 files changed:
MAINTAINERS
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00debug.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/wl12xx/wl1271_scan.c
net/mac80211/rate.c