Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Apr 2012 19:47:49 +0000 (15:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Apr 2012 19:47:49 +0000 (15:47 -0400)
commit41833af713457fe92f432a7354bc690587652879
tree6f821f85bd33c1823d557d1482f8aa6216cde5b3
parentf68e556e23d1a4176b563bcb25d8baf2c5313f91
parent66f3b913e68e8e62bd2f9499495eeb6cc81b2662
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth
MAINTAINERS
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c