]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdcb2b280c907020c46f88f7684021d2bc9f91495
tree8fe713fb47d8ba11f91f3e7b6147ce3a00eced20
parentfca1c63bb288e72afe2d24bef936f2e2e5fda493
parent5c8764de5380dbb755c9ef509d946db2a8bfc2f0
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: replace GFP_KERNEL with GFP_NOFS