]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 12 Jun 2012 01:36:42 +0000 (22:36 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 12 Jun 2012 01:36:42 +0000 (22:36 -0300)
commit442e7cf69c5258a743dafd728c2b6c10629dec3c
treee0d785c63d550d81cb42960ac490aebef4bc965c
parent74705d270e1e2ff77ea52486c120b514bdaf99b2
parent8a42fc30b821fc0558c8a3f80357374dec79c6a9
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Conflicts:
net/bluetooth/hci_event.c
include/net/bluetooth/hci.h
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c