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

00748209

Commit 00748209 authored 13 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'tipc-May10-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6

parents 1fc19aff 972a77fb

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/tipc.h 1 addition, 1 deletion

include/linux/tipc.h
net/tipc/addr.h 5 additions, 2 deletions

net/tipc/addr.h
net/tipc/bcast.c 1 addition, 21 deletions

net/tipc/bcast.c
net/tipc/bearer.c 29 additions, 16 deletions

net/tipc/bearer.c
net/tipc/core.c 1 addition, 2 deletions

net/tipc/core.c
net/tipc/discover.c 95 additions, 55 deletions

net/tipc/discover.c
net/tipc/discover.h 5 additions, 6 deletions

net/tipc/discover.h
net/tipc/link.c 60 additions, 44 deletions

net/tipc/link.c
net/tipc/link.h 1 addition, 0 deletions

net/tipc/link.h
net/tipc/msg.c 3 additions, 22 deletions

net/tipc/msg.c
net/tipc/msg.h 54 additions, 107 deletions

net/tipc/msg.h
net/tipc/port.c 33 additions, 22 deletions

net/tipc/port.c
net/tipc/port.h 9 additions, 5 deletions

net/tipc/port.h
net/tipc/socket.c 22 additions, 5 deletions

net/tipc/socket.c
net/tipc/subscr.c 2 additions, 2 deletions

net/tipc/subscr.c

with 321 additions and 310 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