Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

1c1236e3

Commit 1c1236e3 authored 13 years ago by John W. Linville

Downloads
- Plain Diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

parents e10542c4 43f3dc41

No related branches found

No related tags found

Loading

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

include/net/bluetooth/hci.h 34 additions, 0 deletions

include/net/bluetooth/hci.h
include/net/bluetooth/hci_core.h 13 additions, 0 deletions

include/net/bluetooth/hci_core.h
include/net/bluetooth/l2cap.h 62 additions, 33 deletions

include/net/bluetooth/l2cap.h
include/net/bluetooth/mgmt.h 10 additions, 0 deletions

include/net/bluetooth/mgmt.h
include/net/bluetooth/smp.h 46 additions, 0 deletions

include/net/bluetooth/smp.h
net/bluetooth/Kconfig 8 additions, 0 deletions

net/bluetooth/Kconfig
net/bluetooth/Makefile 1 addition, 1 deletion

net/bluetooth/Makefile
net/bluetooth/hci_conn.c 53 additions, 3 deletions

net/bluetooth/hci_conn.c
net/bluetooth/hci_core.c 113 additions, 0 deletions

net/bluetooth/hci_core.c
net/bluetooth/hci_event.c 69 additions, 0 deletions

net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c 6 additions, 64 deletions

net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c 358 additions, 342 deletions

net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c 83 additions, 14 deletions

net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c 71 additions, 1 deletion

net/bluetooth/mgmt.c
net/bluetooth/smp.c 533 additions, 0 deletions

net/bluetooth/smp.c

with 1460 additions and 458 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment