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)
commita006827a152c3f4d09324157096c8f89cf7ddca3
tree3590601aa271f8def4ef6fdc701eb0004a05f925
parent1d9e954e8b522ae37c7c0fdd791b5736321684a0
parent08cf42e843f9a7e253502011c81677f61f7e5c42
Merge git://git./linux/kernel/git/jberg/mac80211-next
net/mac80211/util.c
net/wireless/nl80211.c