Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 17:59:42 +0000 (13:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 17:59:42 +0000 (13:59 -0400)
1  2 
net/wireless/nl80211.c
net/wireless/reg.c

Simple merge
Simple merge