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

bb411b4d

Commit bb411b4d 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 44c866a0 26954c7f

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/bluetooth/Kconfig 2 additions, 2 deletions

drivers/bluetooth/Kconfig
drivers/bluetooth/ath3k.c 0 additions, 3 deletions

drivers/bluetooth/ath3k.c
drivers/bluetooth/btmrvl_sdio.c 94 additions, 30 deletions

drivers/bluetooth/btmrvl_sdio.c
drivers/bluetooth/btmrvl_sdio.h 36 additions, 32 deletions

drivers/bluetooth/btmrvl_sdio.h
drivers/bluetooth/hci_ath.c 6 additions, 1 deletion

drivers/bluetooth/hci_ath.c
drivers/bluetooth/hci_h4.c 6 additions, 1 deletion

drivers/bluetooth/hci_h4.c
drivers/bluetooth/hci_ldisc.c 4 additions, 2 deletions

drivers/bluetooth/hci_ldisc.c
include/net/bluetooth/l2cap.h 62 additions, 68 deletions

include/net/bluetooth/l2cap.h
net/bluetooth/hci_event.c 4 additions, 0 deletions

net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c 726 additions, 618 deletions

net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c 24 additions, 48 deletions

net/bluetooth/l2cap_sock.c

with 964 additions and 805 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