]> 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: 078dda9 f9668a0)
Merge remote-tracking branch 'xfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 23:19:15 +0000 (10:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 23:19:15 +0000 (10:19 +1100)
Conflicts:
fs/xfs/xfs_fsops.c


Trivial merge
Linux kernel for KaRo TX COM modules