From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 4 Sep 2014 17:41:33 +0000 (-0400)
Subject: Merge tag 'mac80211-next-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: fixes-against-v3.18-rc2~81^2~133^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4ead3f29256ed83991cd77b39334aadd25672a;p=pandora-kernel.git

Merge tag 'mac80211-next-for-john-2014-08-29' of git://git./linux/kernel/git/jberg/mac80211-next

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
---

ef4ead3f29256ed83991cd77b39334aadd25672a
Reading git-diff-tree failed