Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

fd9ec7d3

Commit fd9ec7d3 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 82a28c79 e7c29cb1

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/net/bluetooth/hci_core.h 2 additions, 1 deletion

include/net/bluetooth/hci_core.h
net/bluetooth/af_bluetooth.c 1 addition, 1 deletion

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

net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c 4 additions, 7 deletions

net/bluetooth/hci_event.c
net/bluetooth/l2cap.c 28 additions, 6 deletions

net/bluetooth/l2cap.c
net/bluetooth/sco.c 1 addition, 1 deletion

net/bluetooth/sco.c

with 54 additions and 19 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