Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git.kernel.org/pub/scm/linux...
commit62fb50ab7c903357c92cef2f7677235b92ac575f
authorChris Mason <clm@fb.com>
Mon, 12 Oct 2015 23:24:15 +0000 (12 16:24 -0700)
committerChris Mason <clm@fb.com>
Mon, 12 Oct 2015 23:24:15 +0000 (12 16:24 -0700)
tree28f66d4e2c14b508b6b24795bfadf11aaada2d75
parent640926ffdda7e817965d3bfb5bbbc51598ccf49b
parent73416dab235e5ff030e3b3c61da0cd6ced324fc9
Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git./linux/kernel/git/kdave/linux into for-linus-4.4

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/ctree.h
fs/btrfs/dev-replace.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/ioctl.c
fs/btrfs/root-tree.c
fs/btrfs/transaction.c
fs/btrfs/volumes.c