diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 18:23:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 18:23:32 +0200 |
| commit | 5af568cbd55f60b5a1d174f621b273e4f585dc35 (patch) | |
| tree | 7cdc1afeb267519133a29ac595df21278c556c8c /fs/sysv/super.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus (diff) | |
| parent | isofs: Fix lseek() to position beyond 4 GB (diff) | |
| download | linux-5af568cbd55f60b5a1d174f621b273e4f585dc35.tar.xz linux-5af568cbd55f60b5a1d174f621b273e4f585dc35.zip | |
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:
isofs: Fix lseek() to position beyond 4 GB
vfs: remove unused MNT_STRICTATIME
vfs: show unreachable paths in getcwd and proc
vfs: only add " (deleted)" where necessary
vfs: add prepend_path() helper
vfs: __d_path: dont prepend the name of the root dentry
ia64: perfmon: add d_dname method
vfs: add helpers to get root and pwd
cachefiles: use path_get instead of lone dget
fs/sysv/super.c: add support for non-PDP11 v7 filesystems
V7: Adjust sanity checks for some volumes
Add v7 alias
v9fs: fixup for inode_setattr being removed
Manual merge to take Al's version of the fs/sysv/super.c file: it merged
cleanly, but Al had removed an unnecessary header include, so his side
was better.
Diffstat (limited to 'fs/sysv/super.c')
| -rw-r--r-- | fs/sysv/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/sysv/super.c b/fs/sysv/super.c index 85359a8df605..a0b0cda6927e 100644 --- a/fs/sysv/super.c +++ b/fs/sysv/super.c @@ -24,7 +24,6 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/buffer_head.h> -#include <linux/parser.h> #include "sysv.h" /* |