Merge branch 'xfs-coccinelle-cleanups' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 30 Nov 2014 22:03:02 +0000 (09:03 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 30 Nov 2014 22:03:02 +0000 (09:03 +1100)
1  2 
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_ialloc.c
fs/xfs/xfs_file.c
fs/xfs/xfs_qm.c
fs/xfs/xfs_super.c

Simple merge
Simple merge
Simple merge
diff --cc fs/xfs/xfs_qm.c
Simple merge
Simple merge