diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-19 14:37:53 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-19 14:37:53 +0100 |
| commit | 4b0b2f088f12e2ada1297502d7bebde182cf65b0 (patch) | |
| tree | c3f5bdb06a047eaca8a2e09b6dfd285d0cc26037 /net/l2tp | |
| parent | Bluetooth: Add missing mgmt_confirm_name command definition (diff) | |
| parent | Revert "Bluetooth: Revert: Fix L2CAP connection establishment" (diff) | |
| download | linux-4b0b2f088f12e2ada1297502d7bebde182cf65b0.tar.xz linux-4b0b2f088f12e2ada1297502d7bebde182cf65b0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions