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

220b881a

Commit 220b881a authored 14 years ago by Gustavo Padovan

Downloads
- Plain Diff

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

parents 80a1e1db 6f5ef998

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/bluetooth/btusb.c 5 additions, 1 deletion

drivers/bluetooth/btusb.c
include/net/bluetooth/hci.h 2 additions, 0 deletions

include/net/bluetooth/hci.h
net/bluetooth/hci_core.c 8 additions, 2 deletions

net/bluetooth/hci_core.c
net/bluetooth/hci_event.c 3 additions, 1 deletion

net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c 3 additions, 1 deletion

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

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

net/bluetooth/mgmt.c

with 26 additions and 7 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