Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
authorDavid Sterba <dsterba@suse.com>
Wed, 25 May 2016 20:51:03 +0000 (22:51 +0200)
committerDavid Sterba <dsterba@suse.com>
Wed, 25 May 2016 20:51:03 +0000 (22:51 +0200)
commit42f31734eb7658fd01fb186d56312be869450a42
treeb2fb549b9549bead4d2837c81760cf87fa50ad43
parente73440868fde7cce4a93583a4fa2db9a8938a7ed
parent0132761017e012ab4dc8584d679503f2ba26ca86
Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
21 files changed:
fs/btrfs/backref.c
fs/btrfs/btrfs_inode.h
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/dev-replace.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/ordered-data.h
fs/btrfs/relocation.c
fs/btrfs/root-tree.c
fs/btrfs/scrub.c
fs/btrfs/send.c
fs/btrfs/super.c
fs/btrfs/transaction.c
fs/btrfs/tree-log.c
fs/btrfs/volumes.c