Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Apr 2011 19:28:49 +0000 (15:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Apr 2011 19:28:49 +0000 (15:28 -0400)
commitdee04cac28b5f8a99e002ec1b2e0a49f3155bda0
tree28901cbdc89676bdfb17f6bbc8d4ff8bbedb2cd1
parentce6cac88a4f1e52a51a31c31562f4da347543147
parent7cbc9bd99542752ff570abca79d0027669a01fb8
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next-2.6
net/bluetooth/hci_core.c