Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:28:22 +0000 (14:28 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:28:22 +0000 (14:28 -0500)
commit9662cbc712babe3f7a792af2bdd47fa0c631f27f
tree9a19f5656fb83ab58a4a3773b12ed1036bf8753b
parent640f5950a7d9fd0d279d843b261eb934793605fb
parent4b0b2f088f12e2ada1297502d7bebde182cf65b0
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next
include/net/bluetooth/hci_core.h
net/bluetooth/hci_sysfs.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c