Merge remote-tracking branch 'f2fs/dev'

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

Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)

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

Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/f2fs/checkpoint.c
Simple merge
diff --cc fs/f2fs/node.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 00:58:26 +0000 (10:58 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/checkpoint.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/node.c	patch \|	diff1 \|	diff2 \|	blob \| history