Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 16:55:38 +0000 (12:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 16:55:38 +0000 (12:55 -0400)
commit737be10d8cb783d1cadb1868b061abb2b4314eae
tree1b72ea0d454affab6d6cc743939cfb316fad14b3
parent03c4444650969431b3a5effde4995de767e3013a
parentd3a58df87a2e4c2301ac843604202d290a48440b
Merge git://git./linux/kernel/git/jberg/mac80211-next
net/mac80211/sta_info.c
net/mac80211/status.c
net/mac80211/trace.h