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

Simple merge
Simple merge