projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e49570 fada105)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 11 Nov 2011 16:34:47 +0000 (11:34 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 11 Nov 2011 16:34:47 +0000 (11:34 -0500)
1  2 
net/mac80211/mlme.c patch | diff1 | diff2 | blob | history
net/mac80211/rx.c patch | diff1 | diff2 | blob | history
net/mac80211/util.c patch | diff1 | diff2 | blob | history
net/wireless/reg.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/mlme.c
Simple merge
diff --cc net/mac80211/rx.c
Simple merge
diff --cc net/mac80211/util.c
Simple merge
diff --cc net/wireless/reg.c
Simple merge