summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-18 16:58:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-18 16:58:34 -0800
commit7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf (patch)
tree8fe713fb47d8ba11f91f3e7b6147ce3a00eced20 /drivers/char
parentd22966d0673290bc43383fb9613621ef5ec9de5e (diff)
parentc09c59e6a070d6af05f238f255aea268185273ef (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
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions