Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
Linus Torvalds [Thu, 3 Nov 2011 00:01:01 +0000 (17:01 -0700)]
* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security:
  TOMOYO: Fix interactive judgment functionality.

1  2 
security/tomoyo/common.c

Simple merge