Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
commit4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f
tree587ffa9493e4b6af014f9acb2c09177c2c54af3b
parentafa762f6871a8cb05fbef5d0f83fac14304aa816
parent985140369be1e886754d8ac0375dd64e4f727311
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c