Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Nov 2011 00:01:01 +0000 (17:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Nov 2011 00:01:01 +0000 (17:01 -0700)
commit2380078cdb7e6d520e33dcf834e0be979d542e48
tree105a729f483b77453ea7a570f39e9efe76e38aa0
parent6681ba7ec480bc839584fd0817991d248b4b9e44
parent59df3166ef293288d164ab3362a717743e62d20c
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security

* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security:
  TOMOYO: Fix interactive judgment functionality.
security/tomoyo/common.c