Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
commitc125d5e846894043361c0c89c1140be8fd6600b7
tree8c613b696dc65b047ae6660e55abcd0c008be490
parent6a32e4f9dd9219261f8856f817e6655114cfec2f
parent6b441fab28ea1cbbf3da75dcd1e7438e6cba704c
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c
net/bluetooth/rfcomm/core.c