Merge branch 'dev/pending-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChris Mason <clm@fb.com>
Tue, 25 Nov 2014 13:45:30 +0000 (05:45 -0800)
committerChris Mason <clm@fb.com>
Tue, 25 Nov 2014 13:45:30 +0000 (05:45 -0800)

Trivial merge