| commit | 7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 18 16:58:34 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 18 16:58:34 2009 -0800 |
| tree | 8fe713fb47d8ba11f91f3e7b6147ce3a00eced20 | |
| parent | d22966d0673290bc43383fb9613621ef5ec9de5e [diff] | |
| parent | c09c59e6a070d6af05f238f255aea268185273ef [diff] |
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