From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: upstream/snapshot3+hdmi~16549
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf;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: replace GFP_KERNEL with GFP_NOFS
---

7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf