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)
commitcbe461c526e1e0f8b55f91180df64f02d8daed45
treee0d785c63d550d81cb42960ac490aebef4bc965c
parent1d0c4da8f717937aeda47a72bc769d80f8776795
parent1c2e004183178e1947882cd2e74f37826f45230e
Merge branch 'for-upstream' of git://git./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