Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Dec 2012 18:46:03 +0000 (13:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Dec 2012 18:46:03 +0000 (13:46 -0500)
commit06ef5c4bbb9816e7a7eb44917f11c2e3375fb51a
treecac94ec09e789a6e5162d1925ee944075bf6eef6
parent55cec505559dade9e7776de8f3d23fc3e54e091d
parent0b27a4b97cb1874503c78453c0903df53c0c86b2
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c