Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

fe27d4b0

Commit fe27d4b0 authored 14 years ago by James Morris

Downloads
- Plain Diff

Merge branch 'smack-next-master' into next

parents ad9c2b04 676dac4b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/xattr.h 2 additions, 0 deletions

include/linux/xattr.h
security/smack/smack.h 30 additions, 0 deletions

security/smack/smack.h
security/smack/smack_access.c 2 additions, 2 deletions

security/smack/smack_access.c
security/smack/smack_lsm.c 142 additions, 50 deletions

security/smack/smack_lsm.c
security/smack/smackfs.c 2 additions, 2 deletions

security/smack/smackfs.c

with 178 additions and 54 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