| commit | ef4ead3f29256ed83991cd77b39334aadd25672a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Sep 04 13:41:33 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Sep 04 13:41:33 2014 -0400 |
| tree | a164b021488a7b1dc869c093886cada1ff07fde4 | |
| parent | 6a5d088a923854569e20eac4f3f569926d5911ec [diff] | |
| parent | d0616613d9cf17919fbd46fa0274db4b0084ad62 [diff] |
Merge tag 'mac80211-next-for-john-2014-08-29' of git://git.kernel.org/pub/scm/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