Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChris Mason <clm@fb.com>
Wed, 25 Mar 2015 17:43:16 +0000 (10:43 -0700)
committerChris Mason <clm@fb.com>
Wed, 25 Mar 2015 17:43:16 +0000 (10:43 -0700)
1  2 
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/qgroup.c
fs/btrfs/scrub.c
fs/btrfs/super.c
fs/btrfs/transaction.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/btrfs/file.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge