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

c0068c85

Commit c0068c85 authored 14 years ago by John W. Linville

Downloads
- Plain Diff

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

parents 2411054a adb08ede

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 1 addition, 1 deletion

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

net/bluetooth/hci_core.c
net/bluetooth/hci_sock.c 3 additions, 5 deletions

net/bluetooth/hci_sock.c
net/bluetooth/hci_sysfs.c 1 addition, 2 deletions

net/bluetooth/hci_sysfs.c
net/bluetooth/l2cap.c 21 additions, 3 deletions

net/bluetooth/l2cap.c
net/bluetooth/rfcomm/tty.c 1 addition, 1 deletion

net/bluetooth/rfcomm/tty.c

with 28 additions and 13 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