]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit760a52e80fdf018a9f83a499427923e18e3bd582
treeb37743abb28d9109ce6278b8a896712e713bb25atree | snapshot
parent0395442ad25853f50d515f4dc00e3475b0df920dcommit | diff
parent47b6308b643302e642ca2a5cb6470926f7e1c428commit | diff
Merge remote-tracking branch 'wireless-next/master' into mac80211-next

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>
Linux kernel for KaRo TX COM modules