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

47abf28d

Commit 47abf28d authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 28faa979 e550dfb0

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

include/net/bluetooth/hci_core.h 2 additions, 1 deletion

include/net/bluetooth/hci_core.h
net/bluetooth/af_bluetooth.c 1 addition, 1 deletion

net/bluetooth/af_bluetooth.c
net/bluetooth/hci_conn.c 18 additions, 3 deletions

net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c 4 additions, 7 deletions

net/bluetooth/hci_event.c
net/bluetooth/l2cap.c 28 additions, 6 deletions

net/bluetooth/l2cap.c
net/bluetooth/sco.c 1 addition, 1 deletion

net/bluetooth/sco.c
net/ipv6/ip6_output.c 32 additions, 32 deletions

net/ipv6/ip6_output.c
net/xfrm/xfrm_policy.c 1 addition, 0 deletions

net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c 2 additions, 0 deletions

net/xfrm/xfrm_state.c

with 89 additions and 51 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