Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 11 Nov 2011 16:34:47 +0000 (11:34 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 11 Nov 2011 16:34:47 +0000 (11:34 -0500)
commitfb14ca438c0a54306419ee648d9d146c5e7be679
tree5a4a434461fceb2586a250e702838264431c7f3d
parent1e49570171117e547e6324c58371db4a0dc2f1db
parentfada10584d3890258e59da73728510ad7e08a033
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/util.c
net/wireless/reg.c