Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 03:28:46 +0000 (20:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 03:28:46 +0000 (20:28 -0700)
commitc1c6c11a6860c8135fd0d923c3d49fb368889b10
tree7d58008c7cf943b7b6d07f5a26d59ca9e0bdab6d
parent2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5
parentcfeb414537b1d7c23ba202f198fa4154cd5a4856
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6