Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
1  2 
net/mac80211/util.c
net/wireless/nl80211.c

Simple merge
Simple merge