projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66e8ac7 46fc58d)
Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:31:13 +0000 (13:31 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:31:13 +0000 (13:31 +1000)
1  2 
fs/xfs/libxfs/xfs_ialloc.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/libxfs/xfs_ialloc.c
Simple merge
diff --cc fs/xfs/xfs_inode.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.