Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 04:12:39 +0000 (21:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 04:12:39 +0000 (21:12 -0700)
commit7f0d384cafabfbb56663ee6944c18fc0450fc5d6
treebf68721fb65b64392177f498a9ba61ef027b2b3d
parent90ec7819737d42a0ad1c2df1ff56016facae3c6e
parent01afaf61983d08ed1c9e5e8f2fcf4f40e9008033
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  Minix: Clean up left over label
  fix truncate inode time modification breakage
  fix setattr error handling in sysfs, configfs
  fcntl: return -EFAULT if copy_to_user fails
  wrong type for 'magic' argument in simple_fill_super()
  fix the deadlock in qib_fs
  mqueue doesn't need make_bad_inode()