projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a5d088 d061661)
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)
commitef4ead3f29256ed83991cd77b39334aadd25672a
treea164b021488a7b1dc869c093886cada1ff07fde4tree | snapshot
parent6a5d088a923854569e20eac4f3f569926d5911eccommit | diff
parentd0616613d9cf17919fbd46fa0274db4b0084ad62commit | diff
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
drivers/net/wireless/ath/wil6210/wmi.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/cfg80211.c diff1 | diff2 | blob | history
net/mac80211/chan.c diff1 | diff2 | blob | history
net/wireless/core.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.