Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 (15cb3096) · Commits · Nicola Sparnacci / linux-seco-intel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux-seco-intel
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

15cb3096

Commit 15cb3096 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-2.6

parents 4daf50f2 55183d06

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

drivers/bluetooth/ath3k.c 1 addition, 0 deletions

drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c 1 addition, 0 deletions

drivers/bluetooth/btusb.c
include/net/bluetooth/hci_core.h 1 addition, 0 deletions

include/net/bluetooth/hci_core.h
include/net/bluetooth/l2cap.h 6 additions, 3 deletions

include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c 17 additions, 0 deletions

net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c 4 additions, 1 deletion

net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c 133 additions, 60 deletions

net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c 13 additions, 59 deletions

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

net/bluetooth/mgmt.c
net/bluetooth/rfcomm/core.c 1 addition, 1 deletion

net/bluetooth/rfcomm/core.c

with 180 additions and 124 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