Merge branch 'sysfs-fsdevices-4.2-part1' of git://git.kernel.org/pub/scm/linux/kernel...
authorChris Mason <clm@fb.com>
Tue, 23 Jun 2015 12:34:39 +0000 (05:34 -0700)
committerChris Mason <clm@fb.com>
Tue, 23 Jun 2015 12:34:39 +0000 (05:34 -0700)

Trivial merge