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

82362ccb

Commit 82362ccb authored 13 years ago by John W. Linville

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem

parents 118133e6 3373b28e

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/bluetooth/btmrvl_debugfs.c 12 additions, 0 deletions

drivers/bluetooth/btmrvl_debugfs.c
drivers/net/wireless/mwifiex/cfg80211.c 2 additions, 0 deletions

drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwl8k.c 3 additions, 1 deletion

drivers/net/wireless/mwl8k.c
net/bluetooth/hci_event.c 10 additions, 8 deletions

net/bluetooth/hci_event.c
net/bluetooth/l2cap_sock.c 1 addition, 0 deletions

net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c 1 addition, 0 deletions

net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c 12 additions, 1 deletion

net/bluetooth/sco.c

with 41 additions and 10 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