summaryrefslogtreecommitdiffstats
path: root/fs/proc/inode.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-08-29 17:39:34 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-08-29 17:39:34 +0200
commit83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch)
tree5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /fs/proc/inode.c
parent[GFS2] Allow mounting of gfs2 and gfs2meta at the same time (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadlinux-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.tar.xz
linux-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.zip
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/proc/inode.c')
0 files changed, 0 insertions, 0 deletions