Merge remote-tracking branch 'f2fs/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:01:56 +0000 (11:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:01:56 +0000 (11:01 +1100)

Trivial merge