| commit | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 04 21:12:39 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 04 21:12:39 2010 -0700 |
| tree | bf68721fb65b64392177f498a9ba61ef027b2b3d | |
| parent | 90ec7819737d42a0ad1c2df1ff56016facae3c6e [diff] | |
| parent | 01afaf61983d08ed1c9e5e8f2fcf4f40e9008033 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()