]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'xfs-4.7-error-cfg' into for-next
authorDave Chinner <david@fromorbit.com>
Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
committerDave Chinner <david@fromorbit.com>
Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
1  2 
fs/xfs/xfs_mount.c
fs/xfs/xfs_trace.h

Simple merge
Simple merge