]> 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: a4523a8 cb6b2eb)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 15:46:10 +0000 (08:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 15:46:10 +0000 (08:46 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [PATCH] Fix pSeries identification in prom_init.c
  [PATCH] powerpc: fix kernel version display on pseries boxes


Trivial merge
Linux kernel for KaRo TX COM modules