Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  ima: hashing large files bug fix
  kernel_read: redefine offset type

...

This commit is contained in:

Linus Torvalds 2009-08-24 12:24:01 -07:00

parent 637952ca68 16bfa38b19

commit ce0cfd4ca8

3 changed files with 7 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

4

fs/exec.c

View file

2

include/linux/fs.h

View file

6

security/integrity/ima/ima_crypto.c

View file