Merge branch 'master' into gfs2

author Steven Whitehouse <swhiteho@redhat.com>

Thu, 28 Sep 2006 12:29:59 +0000 (08:29 -0400)

committer Steven Whitehouse <swhiteho@redhat.com>

Thu, 28 Sep 2006 12:29:59 +0000 (08:29 -0400)
author Steven Whitehouse <swhiteho@redhat.com>
Thu, 28 Sep 2006 12:29:59 +0000 (08:29 -0400)
committer Steven Whitehouse <swhiteho@redhat.com>
Thu, 28 Sep 2006 12:29:59 +0000 (08:29 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc mm/filemap.c
Simple merge
author	Steven Whitehouse <swhiteho@redhat.com>
	Thu, 28 Sep 2006 12:29:59 +0000 (08:29 -0400)
committer	Steven Whitehouse <swhiteho@redhat.com>
	Thu, 28 Sep 2006 12:29:59 +0000 (08:29 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	patch \|	diff1 \|	diff2 \|	blob \| history