From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Aug 2009 03:17:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.31-rc8~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5311034ddda7aad48934520d3536b9d0e4502672;p=~shefty%2Frdma-dev.git

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
---

5311034ddda7aad48934520d3536b9d0e4502672