tree ae4b7f4aa08783855eec8725985ef22f0037ed93
parent adcb5ad1e5ba3996d53a047c5486efa6e734b413
parent 0915e8865fe4684dc82f043ac7036f34bf89f52a
author David S. Miller <davem@sunset.davemloft.net> 1126645389 -0700
committer David S. Miller <davem@sunset.davemloft.net> 1126645389 -0700

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