Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 20:44:35 +0000 (13:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 20:44:35 +0000 (13:44 -0700)
Pull more vfs fixes from Al Viro:
 "Regression fix from Geert + yet another open-coded kernel_read()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ecryptfs: don't open-code kernel_read()
  xtensa simdisk: Fix proc_create_data() conversion fallout


Trivial merge