]> git.karo-electronics.de Git - linux-beck.git/commit
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)
commit7c7327d9664280cad833da1f14bad13a3ea8f0bf
tree8af1f200310281054bfbaf76a7c90eaebefe5c51
parent40f293ff833f4054de880d105bda0dbb5e2468db
parent3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8
Merge git://git.kernel.org/pub/scm/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!