aboutsummaryrefslogtreecommitdiff
path: root/sound/spi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 20:17:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 20:17:07 -0700
commit5311034ddda7aad48934520d3536b9d0e4502672 (patch)
tree1c4f522322883ccf8e253c95343abc74344bfab8 /sound/spi
parent533995ed85730a1f5f385b9ecb2d2b4b731d27b4 (diff)
parent53a7197aff20e341487fca8575275056fe1c63e5 (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: iint put in ima_counts_get and put
Diffstat (limited to 'sound/spi')
0 files changed, 0 insertions, 0 deletions