Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next (874c60ba) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

874c60ba

Commit 874c60ba authored 13 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

parents a8c1f65c c5993de8

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

include/net/bluetooth/hci_core.h 2 additions, 2 deletions

include/net/bluetooth/hci_core.h
net/bluetooth/af_bluetooth.c 4 additions, 4 deletions

net/bluetooth/af_bluetooth.c
net/bluetooth/hci_event.c 13 additions, 9 deletions

net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c 0 additions, 2 deletions

net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c 13 additions, 13 deletions

net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c 2 additions, 0 deletions

net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c 2 additions, 2 deletions

net/bluetooth/mgmt.c
net/bluetooth/rfcomm/sock.c 6 additions, 6 deletions

net/bluetooth/rfcomm/sock.c
net/bluetooth/rfcomm/tty.c 11 additions, 11 deletions

net/bluetooth/rfcomm/tty.c
net/bluetooth/sco.c 4 additions, 4 deletions

net/bluetooth/sco.c

with 57 additions and 53 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