Merge branch 'master'

author Steven Whitehouse <[email protected]>

Wed, 5 Jul 2006 12:27:42 +0000 (08:27 -0400)

committer Steven Whitehouse <[email protected]>

Wed, 5 Jul 2006 12:27:42 +0000 (08:27 -0400)
author Steven Whitehouse <[email protected]>
Wed, 5 Jul 2006 12:27:42 +0000 (08:27 -0400)
committer Steven Whitehouse <[email protected]>
Wed, 5 Jul 2006 12:27:42 +0000 (08:27 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Steven Whitehouse <[email protected]>
	Wed, 5 Jul 2006 12:27:42 +0000 (08:27 -0400)
committer	Steven Whitehouse <[email protected]>
	Wed, 5 Jul 2006 12:27:42 +0000 (08:27 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history