projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56e1bd7 9b008c0)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:21:04 +0000 (14:21 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:21:04 +0000 (14:21 -0500)
1  2 
net/bluetooth/hci_core.c patch | diff1 | diff2 | blob | history
net/bluetooth/hci_event.c patch | diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c patch | diff1 | diff2 | blob | history

diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/hci_event.c
Simple merge
diff --cc net/bluetooth/l2cap_core.c
Simple merge
Domain: System / Kernel;