Merge branch 'master'

author Steven Whitehouse <[email protected]>

Thu, 23 Feb 2006 09:49:43 +0000 (09:49 +0000)

committer Steven Whitehouse <[email protected]>

Thu, 23 Feb 2006 09:49:43 +0000 (09:49 +0000)
author Steven Whitehouse <[email protected]>
Thu, 23 Feb 2006 09:49:43 +0000 (09:49 +0000)
committer Steven Whitehouse <[email protected]>
Thu, 23 Feb 2006 09:49:43 +0000 (09:49 +0000)
diff --cc fs/Kconfig
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Steven Whitehouse <[email protected]>
	Thu, 23 Feb 2006 09:49:43 +0000 (09:49 +0000)
committer	Steven Whitehouse <[email protected]>
	Thu, 23 Feb 2006 09:49:43 +0000 (09:49 +0000)
		1	2
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history