tree 0d44d0916200cc49344c41db59fef568711f17b1
parent 634a4b2038a6eba4c211fb906fa2f6ec9a4bbfc7
parent c2c77ec83bdad17fb688557b5b3fdc36661dd1c6
author David S. Miller <davem@davemloft.net> 1269219791 -0700
committer David S. Miller <davem@davemloft.net> 1269219791 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6