Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jun 2011 16:44:20 +0000 (09:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jun 2011 16:44:20 +0000 (09:44 -0700)
commitdf9d030c1324e9b75a425903f9f66bbc960bf713
treef248668ab9451e0087f1de36122f8c6e512fcc39
parente1d76719ea3f3f755d597cef9c2087bdda5fea43
parent82b88bb24e28dd4fb4bec30e75412f41326130f0
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:
  SELinux: skip file_name_trans_write() when policy downgraded.
  selinux: fix case of names with whitespace/multibytes on /selinux/create