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)
1  2 
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c

Simple merge
Simple merge