Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

include/net/bluetooth/hci.h

include/net/bluetooth/hci_core.h

include/net/bluetooth/l2cap.h

include/net/bluetooth/mgmt.h

net/bluetooth/cmtp/core.c

net/bluetooth/hci_conn.c

net/bluetooth/hci_core.c

net/bluetooth/hci_event.c

net/bluetooth/hci_sysfs.c

net/bluetooth/hidp/core.c

net/bluetooth/l2cap_core.c

net/bluetooth/l2cap_sock.c

net/bluetooth/mgmt.c

net/bluetooth/rfcomm/core.c

net/bluetooth/rfcomm/sock.c