Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Jun 2011 18:28:38 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Jun 2011 18:28:38 +0000 (11:28 -0700)
commitca5432010e45d7f809b441b0c1e85e84b039cd85
treeddf8754e813e40ecaa78bcc9ea4c317fc81f9bc1
parent4068b00e9d0542653b26c04dcf05ab0c80bbbbb2
parent4e78c724d47e2342aa8fde61f6b8536f662f795f
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 oops in tomoyo_mount_acl().