Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:32 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:32 +0000 (15:38 +0100)
commit675d276b322b45e7bf7c616a2847bdc425745b99
treec61e7108034bf1230024880ec8ae46a9617077c2
parente9ddd77a31e6ba2867b9c33547f6f079d55f7a72
parent73beece9ca07c003e0e4f4825b12be167334d4ad
Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6
fs/btrfs/ctree.h
fs/btrfs/dev-replace.c
fs/btrfs/disk-io.c
fs/btrfs/extent_io.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/reada.c
fs/btrfs/scrub.c
fs/btrfs/volumes.c