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

Simple merge