Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorGustavo F. Padovan <padovan@profusion.mobi>
Thu, 31 Mar 2011 19:26:01 +0000 (16:26 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 31 Mar 2011 19:26:01 +0000 (16:26 -0300)
commit220b881a77eca96afdd6037dbca3441e8938228f
tree51d1a273521238b5127409c9ea2c0b2df02ec6e9
parent80a1e1dbf62a08984d4c1bfb5a4bca38c3e1664f
parent6f5ef998b7b0b1bf1471654bf6176a5419197128
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-2.6
include/net/bluetooth/hci.h
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c