]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 19:24:01 +0000 (12:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 19:24:01 +0000 (12:24 -0700)
commitce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a
treef06e627594a79086905f798ea0779774beae38ae
parent637952ca689013339b977558061fa4ca8e07e1c1
parent16bfa38b1936212428cb38fbfbbb8f6c62b8d81f
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