summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-27 05:17:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-27 05:17:07 +0200
commit5311034ddda7aad48934520d3536b9d0e4502672 (patch)
tree1c4f522322883ccf8e253c95343abc74344bfab8 /drivers
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff)
parentIMA: iint put in ima_counts_get and put (diff)
downloadlinux-5311034ddda7aad48934520d3536b9d0e4502672.tar.xz
linux-5311034ddda7aad48934520d3536b9d0e4502672.zip
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: iint put in ima_counts_get and put
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions