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)
commit1ed3aad141fe595673c20225a9e004730088be52
treedec75e69b602e677ba0e5231f2d3036663fbd66a
parentf01cb5fbea1c1613621f9f32f385e12c1a29dde0
parent069f40fc07f6df3da325e7ea1698a0d6247983d5
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
net/bluetooth/hci_core.c