]> git.karo-electronics.de Git - linux-beck.git/commitdiff
projects / linux-beck.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 316433b 0a50f16)
Merge branch 'xfs-io-fixes' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 12 Oct 2015 07:38:11 +0000 (18:38 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 12 Oct 2015 07:38:11 +0000 (18:38 +1100)
1  2 
fs/xfs/xfs_file.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_iomap.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_file.c
Simple merge
diff --cc fs/xfs/xfs_iomap.c
Simple merge
Beck SC1x5 Kernel