Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c14fc01 b29c70f)

author	Dave Chinner <david@fromorbit.com>
	Wed, 3 Dec 2014 22:46:17 +0000 (09:46 +1100)
committer	Dave Chinner <david@fromorbit.com>
	Wed, 3 Dec 2014 22:46:17 +0000 (09:46 +1100)
commit	6044e4386cd51dece882ea42352cdaaab0f24cad
tree	cde51132ea9d6afefdf05ad621fc22bbb796d5f4	tree \| snapshot
parent	c14fc01340dd0afe58d8671acc3ea5e907e707ae	commit \| diff
parent	b29c70f59870dad0945b0e0b3fe3758ad528e268	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_da_btree.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_dir2.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_dir2_block.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_dir2_leaf.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_dir2_node.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_dir2_sf.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_ialloc.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_dir2_readdir.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_export.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_icache.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_iomap.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_iops.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_itable.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log_recover.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_mount.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_super.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trans_buf.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.