tree f06e627594a79086905f798ea0779774beae38ae
parent 637952ca689013339b977558061fa4ca8e07e1c1
parent 16bfa38b1936212428cb38fbfbbb8f6c62b8d81f
author Linus Torvalds <torvalds@linux-foundation.org> 1251141841 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251141841 -0700

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