Merge branch 'foreign/zhaolei/reada' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:30 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:30 +0000 (15:38 +0100)
1  2 
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/reada.c

Simple merge
Simple merge
Simple merge