From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2009 21:29:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
X-Git-Tag: v3.0~9212
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c7327d9664280cad833da1f14bad13a3ea8f0bf;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git./linux/kernel/git/holtmann/bluetooth-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6:
  Bluetooth: Don't trigger disconnect timeout for security mode 3 pairing
  Bluetooth: Don't use hci_acl_connect_cancel() for incoming connections
  Bluetooth: Fix wrong module refcount when connection setup fails

Another case of me handling the fallout from Davem's unfortunate
addiction to shuffleboard.

Won't anybody think of the children? Join the anti-shuffleboard league
today!
---

7c7327d9664280cad833da1f14bad13a3ea8f0bf