projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1041638 ab3d59d)
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 30 Oct 2012 08:09:48 +0000 (09:09 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 30 Oct 2012 08:09:48 +0000 (09:09 +0100)
1  2 
net/mac80211/iface.c patch | diff1 | diff2 | blob | history
net/mac80211/rx.c patch | diff1 | diff2 | blob | history
net/mac80211/util.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/iface.c
Simple merge
diff --cc net/mac80211/rx.c
Simple merge
diff --cc net/mac80211/util.c
Simple merge