Merge branch 'foreign/josef/space-updates' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:31 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:31 +0000 (15:38 +0100)
commite9ddd77a31e6ba2867b9c33547f6f079d55f7a72
tree3c2b40e73c989b49826b16e1294e95c01058e3e9
parentff7db6e05a93a23eb43c7d20dc2027bcc939b6a8
parentbaee8790641eac0c0fcb2524a925aec39d9be6e0
Merge branch 'foreign/josef/space-updates' into for-chris-4.6
fs/btrfs/inode.c