Merge branch 'fix/fst-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
commit6b5aa88c861cf0e4156e490009e2018d4fc81109
authorChris Mason <clm@fb.com>
Tue, 26 Jan 2016 00:43:13 +0000 (25 16:43 -0800)
committerChris Mason <clm@fb.com>
Tue, 26 Jan 2016 00:43:13 +0000 (25 16:43 -0800)
tree5a8735c21895edc590517bce47ae1645341cdbfa
parenta6111d11b8b5364d02ea2e881c81ce39d004eb32
parent14e46e04958df740c6c6a94849f176159a333f13
Merge branch 'fix/fst-sysfs' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/ioctl.c
fs/btrfs/super.c
fs/btrfs/volumes.c