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

4b42c542

Commit 4b42c542 authored 13 years ago by John W. Linville

Downloads
- Plain Diff

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

Conflicts:
	net/bluetooth/l2cap_core.c

parents d8598981 e2fd318e

Branches

Tags

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

drivers/bluetooth/ath3k.c 5 additions, 0 deletions

drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c 11 additions, 1 deletion

drivers/bluetooth/btusb.c
include/net/bluetooth/bluetooth.h 8 additions, 4 deletions

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

include/net/bluetooth/hci.h
include/net/bluetooth/hci_core.h 26 additions, 3 deletions

include/net/bluetooth/hci_core.h
include/net/bluetooth/l2cap.h 20 additions, 5 deletions

include/net/bluetooth/l2cap.h
include/net/bluetooth/mgmt.h 2 additions, 0 deletions

include/net/bluetooth/mgmt.h
include/net/bluetooth/smp.h 1 addition, 0 deletions

include/net/bluetooth/smp.h
net/bluetooth/hci_core.c 81 additions, 20 deletions

net/bluetooth/hci_core.c
net/bluetooth/hci_event.c 85 additions, 2 deletions

net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c 68 additions, 148 deletions

net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c 65 additions, 4 deletions

net/bluetooth/l2cap_sock.c
net/bluetooth/lib.c 21 additions, 2 deletions

net/bluetooth/lib.c
net/bluetooth/mgmt.c 89 additions, 59 deletions

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

net/bluetooth/sco.c
net/bluetooth/smp.c 188 additions, 20 deletions

net/bluetooth/smp.c

with 690 additions and 270 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