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)
1  2 
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c
net/bluetooth/sco.c

Simple merge
Simple merge
Simple merge
Simple merge