Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus

Browse source

Pulled from Mimi's tree.

...

This commit is contained in:

James Morris 2013-01-07 12:11:37 +11:00

parent 5f243b9b46 a7f2a366f6

commit ade24c93ab

3 changed files with 11 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

security/integrity/ima/ima.h

View file

12

security/integrity/ima/ima_main.c

View file

3

security/integrity/ima/ima_policy.c

View file