]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 907b9bc 7c25041)
[GFS2] Fix up merge of Linus' kernel into GFS2
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 25 Sep 2006 16:26:59 +0000 (12:26 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 25 Sep 2006 16:26:59 +0000 (12:26 -0400)
commit363e065c02b1273364d5356711a83e7f548fc0c8
tree0df0e65da403ade33ade580c2770c97437b1b1aftree | snapshot
parent907b9bceb41fa46beae93f79cc4a2247df502c0fcommit | diff
parent7c250413e5b7c3dfae89354725b70c76d7621395commit | diff
[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
CREDITS diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
fs/Kconfig diff1 | diff2 | blob | history
include/linux/Kbuild diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
include/linux/kernel.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.