Merge branch 'foreign/qu/norecovery-v7' 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)
commit23c1a966f2525e71f895bf349a5ae9e5d7bdd67f
treecdbe7b2a556b4789c2c61b9dc1bffe864654edde
parent67d605fec1d406f6a0272be39686801d389f59c9
parentfed8f166ebf3afb8b91a1fd73d706788e07a91ef
Merge branch 'foreign/qu/norecovery-v7' into for-chris-4.6
fs/btrfs/ctree.h
fs/btrfs/disk-io.c