Merge ../linux-2.6

2006-05-19 15:02:42 +10:00
parent 4d1f3f25d9 a54c9d30db
commit 3c06da5ae5
288 changed files with 6518 additions and 2684 deletions
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -255,7 +255,7 @@ static int __init pSeries_init_panel(void)
 {
 	/* Manually leave the kernel version on the panel. */
 	ppc_md.progress("Linux ppc64\n", 0);
-	ppc_md.progress(system_utsname.version, 0);
+	ppc_md.progress(system_utsname.release, 0);

 	return 0;
 }