Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Dec 2011 16:05:44 +0000 (11:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Dec 2011 16:05:44 +0000 (11:05 -0500)
commitcbec0627ef1adf7afa448e8bbae3146ce910212a
tree0a0956e19fb28c6eace2d445b1603afc2fd260ca
parentf61759e6b831a55b89e584b198c3da325e2bc379
parent9995ffe5f5fdddcc73e4465cc3f8b38714df8108
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
net/mac80211/util.c
net/wireless/reg.c