projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 790eff4 ea1e76a)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 26 Jun 2012 15:36:30 +0000 (08:36 -0700)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 26 Jun 2012 15:36:30 +0000 (08:36 -0700)
1  2 
drivers/bluetooth/btmrvl_sdio.c patch | diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c patch | diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c patch | diff1 | diff2 | blob | history
net/bluetooth/mgmt.c patch | diff1 | diff2 | blob | history

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