projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe986f9 c88547a)
Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 3 Apr 2014 21:07:35 +0000 (08:07 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 3 Apr 2014 21:07:35 +0000 (08:07 +1100)
1  2 
fs/xfs/xfs_aops.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_da_btree.c patch | diff1 | diff2 | blob | history

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