projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f08e47 f8adaf0)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Oct 2014 18:48:29 +0000 (14:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Oct 2014 18:48:29 +0000 (14:48 -0400)
1  2 
drivers/net/wireless/ath/ath9k/main.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c patch | diff1 | diff2 | blob | history
net/mac80211/sta_info.c patch | diff1 | diff2 | blob | history
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge
diff --cc net/mac80211/sta_info.c
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge