]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'xfs-misc-fixes-4.6-2' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
1  2 
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_bmap_btree.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_mount.h

Simple merge
Simple merge
Simple merge
Simple merge