commit | 2380078cdb7e6d520e33dcf834e0be979d542e48 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 02 17:01:01 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 02 17:01:01 2011 -0700 |
tree | 105a729f483b77453ea7a570f39e9efe76e38aa0 | |
parent | 6681ba7ec480bc839584fd0817991d248b4b9e44 [diff] | |
parent | 59df3166ef293288d164ab3362a717743e62d20c [diff] |
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.