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

fb3dbece

Commit fb3dbece authored 14 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 12e94471 eaa71b31

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

include/net/bluetooth/bluetooth.h 18 additions, 0 deletions

include/net/bluetooth/bluetooth.h
net/bluetooth/l2cap.c 29 additions, 33 deletions

net/bluetooth/l2cap.c
net/bluetooth/rfcomm/sock.c 4 additions, 0 deletions

net/bluetooth/rfcomm/sock.c

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