Pull misc-for-upstream into release branch

This commit is contained in:
Len Brown 2007-03-09 23:19:50 -05:00
commit 63e34ca93a
7 changed files with 32 additions and 31 deletions

View file

@ -126,7 +126,8 @@ and is between 256 and 4096 characters. It is defined in the file
See header of drivers/scsi/53c7xx.c.
See also Documentation/scsi/ncr53c7xx.txt.
acpi= [HW,ACPI] Advanced Configuration and Power Interface
acpi= [HW,ACPI,X86-64,i386]
Advanced Configuration and Power Interface
Format: { force | off | ht | strict | noirq }
force -- enable ACPI if default was off
off -- disable ACPI if default was on