Merge branch 'dev/simplify-set-bit' of git://git.kernel.org/pub/scm/linux/kernel...
authorChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:17:42 +0000 (13:17 -0800)
committerChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:17:42 +0000 (13:17 -0800)
commitbb9d687618695e8291f1e6209eb3211d231f97bb
treea54f15066574a80231b3a2630b300f0ebc3745c2
parent13d5d15d6301f8e69a8fe8500f6ef732bfd44bd1
parentcd716d8fea125e5531003e66aaf7ca7323277f83
Merge branch 'dev/simplify-set-bit' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/disk-io.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/file.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/scrub.c