summaryrefslogtreecommitdiffstats
path: root/fs/pnode.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-25 18:26:59 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-25 18:26:59 +0200
commit363e065c02b1273364d5356711a83e7f548fc0c8 (patch)
tree0df0e65da403ade33ade580c2770c97437b1b1af /fs/pnode.c
parent[GFS2/DLM] Fix trailing whitespace (diff)
parent[PATCH] pata_pdc2027x iomem annotations (diff)
downloadlinux-363e065c02b1273364d5356711a83e7f548fc0c8.tar.xz
linux-363e065c02b1273364d5356711a83e7f548fc0c8.zip
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with Linus' latest kernel. This will hopefully allow GFS2 to be more easily merged into forthcoming -mm and FC kernels due to the "one line per header" format now used for the kernel headers. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Conflicts: include/linux/Kbuild include/linux/kernel.h
Diffstat (limited to 'fs/pnode.c')
0 files changed, 0 insertions, 0 deletions