Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

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

Snippets Groups Projects

e3a61d47

Commit e3a61d47 authored 15 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 634a4b20 c2c77ec8

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/bluetooth.h 1 addition, 1 deletion

include/net/bluetooth/bluetooth.h
net/bluetooth/hci_sysfs.c 1 addition, 2 deletions

net/bluetooth/hci_sysfs.c
net/bluetooth/l2cap.c 35 additions, 13 deletions

net/bluetooth/l2cap.c
net/bluetooth/rfcomm/core.c 29 additions, 12 deletions

net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/sock.c 27 additions, 11 deletions

net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c 26 additions, 12 deletions

net/bluetooth/sco.c

with 119 additions and 51 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