From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 24 Jan 2007 06:02:15 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
X-Git-Tag: v2.6.20-rc6~5^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=185bd6e2fb1f77e48e4aed50b77edcbf4f08b8fe;p=~emulex%2Finfiniband.git

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

185bd6e2fb1f77e48e4aed50b77edcbf4f08b8fe