From: Linus Torvalds Date: Mon, 24 Aug 2009 19:24:01 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: upstream/snapshot3+hdmi~17803 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'for-linus' of git://git./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 --- ce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a