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

e5e7ad44

Commit e5e7ad44 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6

parents 61e57448 47b676c0

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

net/ipv4/cipso_ipv4.c 4 additions, 3 deletions

net/ipv4/cipso_ipv4.c
net/netlabel/netlabel_addrlist.c 2 additions, 0 deletions

net/netlabel/netlabel_addrlist.c
net/netlabel/netlabel_addrlist.h 22 additions, 0 deletions

net/netlabel/netlabel_addrlist.h
net/netlabel/netlabel_mgmt.c 1 addition, 1 deletion

net/netlabel/netlabel_mgmt.c

with 29 additions and 4 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