]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfb4c56 b8b39d3)
Merge remote-tracking branch 'xfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 01:18:20 +0000 (11:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 01:18:20 +0000 (11:18 +1000)
1  2 
fs/xfs/xfs_file.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_file.c
Simple merge
Linux kernel for KaRo TX COM modules