projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f2e6a5 7a5f799)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Sep 2012 17:53:49 +0000 (13:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Sep 2012 17:53:49 +0000 (13:53 -0400)
1  2 
drivers/net/wireless/airo.c patch | diff1 | diff2 | blob | history
include/net/cfg80211.h patch | diff1 | diff2 | blob | history
net/bluetooth/l2cap_sock.c patch | diff1 | diff2 | blob | history
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/airo.c
Simple merge
diff --cc include/net/cfg80211.h
Simple merge
diff --cc net/bluetooth/l2cap_sock.c
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge