Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
commit874c60bad92564358e87d58f505fceb0b09ec1aa
treef6a5cadf50e07971f711b6cdf627797c5e1c095b
parenta8c1f65c79cbbb2f7da782d4c9d15639a9b94b27
parentc5993de864d96b3656e9fca38c377b130105d97a
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c
net/bluetooth/sco.c