Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Apr 2011 20:21:38 +0000 (13:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Apr 2011 20:21:38 +0000 (13:21 -0700)
1  2 
net/bluetooth/hci_core.c

Simple merge