Merge remote-tracking branch 'writeback/writeback-for-next'

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

Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)

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

Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)
diff --cc fs/fs-writeback.c
Simple merge
diff --cc fs/super.c
Simple merge
diff --cc lib/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)
		1	2
fs/fs-writeback.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history