Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Feb 2010 07:34:58 +0000 (23:34 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Feb 2010 07:34:58 +0000 (23:34 -0800)
commit1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4
tree0b5940be30331d461cd4421abe7829b392ab6e62
parent71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3
parent6bf8268f9a91f1065c99503161ebd061492bebe3
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6