Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Sep 2012 17:53:49 +0000 (13:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Sep 2012 17:53:49 +0000 (13:53 -0400)
commit9316f0e3c6ba524d8fa14bfded048b252891931a
tree60326e5943997bb72aaf2a375f8a20c61ec7bbcd
parent7f2e6a5d8608d0353b017a0fe15502307593734e
parent7a5f799becc51c842ec1a3aeb8dd82651aea7036
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/airo.c
include/net/cfg80211.h
net/bluetooth/l2cap_sock.c
net/wireless/nl80211.c