projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fbdc75 57bf744)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 26 Jun 2013 16:01:42 +0000 (12:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 26 Jun 2013 16:01:42 +0000 (12:01 -0400)
1  2 
drivers/net/wireless/ath/ath9k/htc_drv_main.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/xmit.c patch | diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge
diff --cc net/bluetooth/l2cap_core.c
Simple merge