]> 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: 0024453 7bbfe23)
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:36:00 +0000 (13:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:36:00 +0000 (13:36 +1000)
Conflicts:
arch/m68k/kernel/module_mm.c
arch/m68k/kernel/module_no.c
arch/x86/lguest/i386_head.S


Trivial merge
Linux kernel for KaRo TX COM modules