Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:41:15 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:41:15 +0000 (11:41 -0700)
commit755ae761c5519929a97567d61a379b87352c337c
tree6942ac77009d3cab1acf6e6bea8cc339368423a9
parent4886b5b485ec78fe4a16fedaccfab39bdf55410f
parentacd0c935178649f72c44ec49ca83bee35ce1f79e
Merge branch 'for-linus' of git://git./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: update ima_counts_put