Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

This commit is contained in:
Linus Torvalds 2005-08-09 16:03:19 -07:00
commit a7df26da15

View File

@ -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);