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

27b61ae2

Commit 27b61ae2 authored 14 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 46af3180 633d2bde

No related branches found

No related tags found

Loading

Changes 23

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 2 additions, 4 deletions

MAINTAINERS
include/linux/tipc_config.h 3 additions, 3 deletions

include/linux/tipc_config.h
net/tipc/Kconfig 0 additions, 12 deletions

net/tipc/Kconfig
net/tipc/addr.c 5 additions, 10 deletions

net/tipc/addr.c
net/tipc/addr.h 13 additions, 4 deletions

net/tipc/addr.h
net/tipc/bearer.c 7 additions, 11 deletions

net/tipc/bearer.c
net/tipc/bearer.h 1 addition, 5 deletions

net/tipc/bearer.h
net/tipc/config.c 4 additions, 27 deletions

net/tipc/config.c
net/tipc/core.c 0 additions, 6 deletions

net/tipc/core.c
net/tipc/core.h 0 additions, 1 deletion

net/tipc/core.h
net/tipc/discover.c 60 additions, 43 deletions

net/tipc/discover.c
net/tipc/link.c 29 additions, 21 deletions

net/tipc/link.c
net/tipc/link.h 2 additions, 1 deletion

net/tipc/link.h
net/tipc/msg.c 0 additions, 34 deletions

net/tipc/msg.c
net/tipc/msg.h 2 additions, 40 deletions

net/tipc/msg.h
net/tipc/name_distr.c 9 additions, 9 deletions

net/tipc/name_distr.c
net/tipc/net.c 6 additions, 26 deletions

net/tipc/net.c
net/tipc/net.h 1 addition, 18 deletions

net/tipc/net.h
net/tipc/node.c 57 additions, 66 deletions

net/tipc/node.c
net/tipc/node.h 23 additions, 13 deletions

net/tipc/node.h

with 224 additions and 354 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