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)
* '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


Trivial merge