]> 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: 12f7c25 809a4fa)
Merge remote-tracking branch 'gfs2/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:02:16 +0000 (14:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:02:16 +0000 (14:02 +1100)
Conflicts:
fs/gfs2/file.c


Trivial merge
Linux kernel for KaRo TX COM modules