projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0395442 47b6308)
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 18 Nov 2014 08:32:36 +0000 (09:32 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 18 Nov 2014 08:32:44 +0000 (09:32 +0100)
This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Trivial merge