Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
commite3a61d47cc37c51834abe537e0ed685829d56ee2
authorDavid S. Miller <davem@davemloft.net>
Mon, 22 Mar 2010 01:03:11 +0000 (21 18:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Mar 2010 01:03:11 +0000 (21 18:03 -0700)
tree0d44d0916200cc49344c41db59fef568711f17b1
parent634a4b2038a6eba4c211fb906fa2f6ec9a4bbfc7
parentc2c77ec83bdad17fb688557b5b3fdc36661dd1c6
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6