]> www.infradead.org Git - users/willy/linux.git/commitdiff
Merge remote-tracking branch 'btrfs-fixes/next-fixes'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 21:23:39 +0000 (08:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 21:23:39 +0000 (08:23 +1100)
1  2 
fs/btrfs/inode.c

Simple merge