]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'xfs-4.10-misc-fixes-2' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 28 Nov 2016 04:06:03 +0000 (15:06 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 28 Nov 2016 04:06:03 +0000 (15:06 +1100)
1  2 
fs/xfs/libxfs/xfs_bmap.c

Simple merge