Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2009 00:58:34 +0000 (16:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2009 00:58:34 +0000 (16:58 -0800)
commit7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf
tree8fe713fb47d8ba11f91f3e7b6147ce3a00eced20
parentd22966d0673290bc43383fb9613621ef5ec9de5e
parentc09c59e6a070d6af05f238f255aea268185273ef
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