Merge branch 'cleanup/blocksize-diet-part2' of git://git.kernel.org/pub/scm/linux...
authorChris Mason <clm@fb.com>
Thu, 22 Jan 2015 01:49:35 +0000 (17:49 -0800)
committerChris Mason <clm@fb.com>
Thu, 22 Jan 2015 01:49:35 +0000 (17:49 -0800)

Trivial merge