Merge remote-tracking branch 'f2fs/dev'

author Thierry Reding <treding@nvidia.com>

Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)

committer Thierry Reding <treding@nvidia.com>

Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)
author Thierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)
committer Thierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)
diff --cc fs/f2fs/data.c
Simple merge
diff --cc fs/f2fs/file.c
Simple merge
author	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)
		1	2
fs/f2fs/data.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history