]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-chris-4.6' into for-next-4.6-20160229
authorDavid Sterba <dsterba@suse.com>
Mon, 29 Feb 2016 18:28:17 +0000 (19:28 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 29 Feb 2016 18:28:17 +0000 (19:28 +0100)
1  2 
fs/btrfs/inode.c

Simple merge