Merge tag 'mac80211-next-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 4 Sep 2014 17:41:33 +0000 (13:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 4 Sep 2014 17:41:33 +0000 (13:41 -0400)
Johannes Berg <johannes@sipsolutions.net> says:

"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Conflicts:
drivers/net/wireless/ath/wil6210/wmi.c

1  2 
drivers/net/wireless/ath/wil6210/wmi.c
drivers/net/wireless/mwifiex/cfg80211.c
net/mac80211/chan.c
net/wireless/core.c

Simple merge
Simple merge