commit | 87302700402b2708c49f89970c295465cc8e5523 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 08 12:14:51 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 08 12:14:51 2011 -0700 |
tree | 94aa87d5219a04c49de0d9e212b858cad3ebf5ba | |
parent | 5c723ba5b7886909b2e430f2eae454c33f7fe5c6 [diff] | |
parent | 4d81897139ffb738ee14b6f84f63f93ecda1136b [diff] |
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: TOMOYO: Fix incomplete read of /sys/kernel/security/tomoyo/profile