diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 23:29:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 23:30:02 +0200 |
| commit | 7c7327d9664280cad833da1f14bad13a3ea8f0bf (patch) | |
| tree | 8af1f200310281054bfbaf76a7c90eaebefe5c51 /include/net/stp.h | |
| parent | Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Bluetooth: Don't trigger disconnect timeout for security mode 3 pairing (diff) | |
| download | linux-7c7327d9664280cad833da1f14bad13a3ea8f0bf.tar.xz linux-7c7327d9664280cad833da1f14bad13a3ea8f0bf.zip | |
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!
Diffstat (limited to 'include/net/stp.h')
0 files changed, 0 insertions, 0 deletions