Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <[email protected]>
Tue, 14 Jun 2011 18:28:38 +0000 (11:28 -0700)
committerLinus Torvalds <[email protected]>
Tue, 14 Jun 2011 18:28:38 +0000 (11:28 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  TOMOYO: Fix oops in tomoyo_mount_acl().


Trivial merge