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)
1  2 
fs/btrfs/inode.c

Simple merge