Merge remote-tracking branch 'logfs/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/logfs/dir.c
Simple merge
diff --cc fs/logfs/logfs.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/logfs/dir.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/logfs/logfs.h	patch \|	diff1 \|	diff2 \|	blob \| history