projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40f293f 3d7a9d1)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 21:29:53 +0000 (14:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 21:30:02 +0000 (14:30 -0700)
* 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!


Trivial merge
Domain: SCM / Uncategorized;