From: Linus Torvalds Date: Thu, 19 Nov 2009 00:58:34 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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: replace GFP_KERNEL with GFP_NOFS --- 7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf