Merge branch 'master'

author Steven Whitehouse <swhiteho@redhat.com>

Mon, 31 Jul 2006 12:59:59 +0000 (08:59 -0400)

committer Steven Whitehouse <swhiteho@redhat.com>

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