projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b08cc24 11b2357)
Merge branch 'mac80211' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 20 Oct 2014 14:41:33 +0000 (16:41 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 20 Oct 2014 19:39:29 +0000 (21:39 +0200)
commit8fa74e3aa6398ffef3c52147c969c0f5f0a1244e
tree01b6138e17581a27d62e71a013bb85638abd9a7atree | snapshot (tar.gz zip)
parentb08cc24e0a24f8d67ba7d66dab43c40ed25a3f5ccommit | diff
parent11b2357d5dbce999803e9055f8c09829a8a87db4commit | diff
Merge branch 'mac80211' into mac80211-next

This was needed to avoid conflicts in the minstrel changes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history