]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...
authorChris Mason <clm@fb.com>
Mon, 29 Feb 2016 16:12:10 +0000 (08:12 -0800)
committerChris Mason <clm@fb.com>
Mon, 29 Feb 2016 16:12:10 +0000 (08:12 -0800)
Btrfs patchsets for 4.6

1  2 
fs/btrfs/inode.c

Simple merge