Revision 716f8954fb3029ca2df52a986b60af8d06f093ee authored by Linus Torvalds on 16 May 2006, 15:46:10 UTC, committed by Linus Torvalds on 16 May 2006, 15:46:10 UTC
* '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