Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 3 Dec 2014 22:46:17 +0000 (09:46 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 3 Dec 2014 22:46:17 +0000 (09:46 +1100)
commit6044e4386cd51dece882ea42352cdaaab0f24cad
treecde51132ea9d6afefdf05ad621fc22bbb796d5f4
parentc14fc01340dd0afe58d8671acc3ea5e907e707ae
parentb29c70f59870dad0945b0e0b3fe3758ad528e268
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

Conflicts:
fs/xfs/xfs_iops.c
21 files changed:
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_da_btree.c
fs/xfs/libxfs/xfs_dir2.c
fs/xfs/libxfs/xfs_dir2_block.c
fs/xfs/libxfs/xfs_dir2_leaf.c
fs/xfs/libxfs/xfs_dir2_node.c
fs/xfs/libxfs/xfs_dir2_sf.c
fs/xfs/libxfs/xfs_ialloc.c
fs/xfs/xfs_buf.c
fs/xfs/xfs_dir2_readdir.c
fs/xfs/xfs_export.c
fs/xfs/xfs_icache.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_iomap.c
fs/xfs/xfs_iops.c
fs/xfs/xfs_itable.c
fs/xfs/xfs_log.c
fs/xfs/xfs_log_recover.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_super.c
fs/xfs/xfs_trans_buf.c