tree 1c4f522322883ccf8e253c95343abc74344bfab8
parent 533995ed85730a1f5f385b9ecb2d2b4b731d27b4
parent 53a7197aff20e341487fca8575275056fe1c63e5
author Linus Torvalds <torvalds@linux-foundation.org> 1251343027 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251343027 -0700

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