projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b311749 2b2fec4)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
1  2 
drivers/bluetooth/btusb.c patch | diff1 | diff2 | blob | history
net/bluetooth/hci_core.c patch | diff1 | diff2 | blob | history
net/bluetooth/mgmt.c patch | diff1 | diff2 | blob | history

diff --cc drivers/bluetooth/btusb.c
Simple merge
diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/mgmt.c
Simple merge