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)
commitff7db6e05a93a23eb43c7d20dc2027bcc939b6a8
treeb53e43b095579cbd4d26adb477f261df9ab46b61
parent23c1a966f2525e71f895bf349a5ae9e5d7bdd67f
parent7aff8cf4a6d6190e64386f407a7f5cc5f24c60d2
Merge branch 'foreign/zhaolei/reada' into for-chris-4.6
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/reada.c