Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Oct 2010 20:11:56 +0000 (16:11 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Oct 2010 20:11:56 +0000 (16:11 -0400)
commitc64557d666eb62eb5f296c6b93bd0a5525ed1e36
tree1e25cc32521d06ae876de18bb8e48b3cf9d30808
parent1a63c353c856c9f6d44a533afb6ad6dbbcdea683
parent0d91f22b75347d9503b17a42b6c74d3f7750acd6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
MAINTAINERS
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00queue.c
net/mac80211/main.c