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)
1  2 
net/mac80211/util.c
net/wireless/reg.c

Simple merge
Simple merge