Merge ../to-linus

2005-08-11 00:56:08 -04:00
parent e872d4cace bc68552faa
commit 95f193aa4f
126 changed files with 2550 additions and 1471 deletions
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@ -179,7 +179,7 @@ static int can_do_pal_halt = 1;

 static int __init nohalt_setup(char * str)
 {
-	pal_halt = 0;
+	pal_halt = can_do_pal_halt = 0;
 	return 1;
 }
 __setup("nohalt", nohalt_setup);