Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Aug 2011 19:14:51 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Aug 2011 19:14:51 +0000 (12:14 -0700)
commit87302700402b2708c49f89970c295465cc8e5523
tree94aa87d5219a04c49de0d9e212b858cad3ebf5ba
parent5c723ba5b7886909b2e430f2eae454c33f7fe5c6
parent4d81897139ffb738ee14b6f84f63f93ecda1136b
Merge branch 'for-linus' of git://git./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