| commit | ce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 24 12:24:01 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 24 12:24:01 2009 -0700 |
| tree | f06e627594a79086905f798ea0779774beae38ae | |
| parent | 637952ca689013339b977558061fa4ca8e07e1c1 [diff] | |
| parent | 16bfa38b1936212428cb38fbfbbb8f6c62b8d81f [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * '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