Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
commit41f4a6f71fe33faa7971c173c263fb431fe987fe
treefdc3e603162e3ad63f6ae4160f68eb803bb78d58
parent94d57c4cfaa43e29ca5fa5ff874048cfc67276f5
parent1728943d83e9fd919e454332fe344944123b3c3a
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
drivers/net/wireless/airo.c
net/mac80211/main.c