Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Jun 2009 12:47:43 +0000 (05:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Jun 2009 12:47:43 +0000 (05:47 -0700)
commitbb400801c2f40bbd9a688818323ad09abfc4e581
treebf23baef0cdc7590b73a53e6b1e88565ba455cf1
parent130aa61a77b8518f1ea618e1b7d214d60b405f10
parent611b30f74b5d8ca036a9923b3bf6e0ee10a21a53
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-next-2.6
include/net/bluetooth/bluetooth.h