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

a1775846

Commit a1775846 authored 14 years ago by John W. Linville

Downloads
- Plain Diff

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

parents e46395a4 b8534e0f

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

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

include/net/bluetooth/hci_core.h
include/net/bluetooth/mgmt.h 40 additions, 33 deletions

include/net/bluetooth/mgmt.h
net/bluetooth/af_bluetooth.c 1 addition, 3 deletions

net/bluetooth/af_bluetooth.c
net/bluetooth/hci_conn.c 5 additions, 3 deletions

net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c 66 additions, 3 deletions

net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c 1 addition, 1 deletion

net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c 6 additions, 7 deletions

net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c 502 additions, 249 deletions

net/bluetooth/mgmt.c
net/bluetooth/sco.c 4 additions, 3 deletions

net/bluetooth/sco.c

with 663 additions and 302 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