From: Linus Torvalds Date: Tue, 16 May 2006 15:46:10 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc X-Git-Tag: v2.6.17-rc5~111 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=716f8954fb3029ca2df52a986b60af8d06f093ee;p=linux-2.6-omap-h63xx.git Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * '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 --- 716f8954fb3029ca2df52a986b60af8d06f093ee