tree 8af1f200310281054bfbaf76a7c90eaebefe5c51
parent 40f293ff833f4054de880d105bda0dbb5e2468db
parent 3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8
author Linus Torvalds <torvalds@linux-foundation.org> 1242422993 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242423002 -0700

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!