Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:22:27 +0000 (15:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:22:27 +0000 (15:22 -0400)
commitbc27d5f14363a1065bf9437a5bca5409492b6c06
treef99ab7eed550f28eec8c68a468c6161320fe9ee1
parentddffeb8c4d0331609ef2581d84de4d763607bd37
parentf706adfeade767d2194c9f39c0f75e944b0bdd23
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next
net/bluetooth/af_bluetooth.c
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/rfcomm/tty.c