]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7b5767 ab03e6a)
Merge remote-tracking branch 'xfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 01:05:08 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 01:05:08 +0000 (12:05 +1100)
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

1  2 
fs/xfs/xfs_aops.c patch | diff1 | diff2 | blob | history

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