Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.4

into intel.com:/home/lenb/src/linux-acpi-test-2.6.5

diff --cc Documentation/kernel-parameters.txt
index 71e616b6e8d0d451a328aea264965bc37a2d2892,28698bf78b1d7800235ce1de4cff4dc9a1a4e8a0..ad50cadea84875d030055c0ad84d746baed01ba0
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -98,15 -98,9 +98,13 @@@ running once the system is up
                                strictly ACPI specification compliant.
  
                        See also Documentation/pm.txt.
 +
 +      acpi_sleep=     [HW,ACPI] Sleep options
 +                      Format: { s3_bios, s3_mode }
 +                      See Documentation/power/video.txt
   
-       acpi_pic_sci=   [HW,ACPI] ACPI System Control Interrupt trigger mode
-                       Format: { level | edge }
-                       level   Force PIC-mode SCI to Level Trigger (default)
-                       edge    Force PIC-mode SCI to Edge Trigge
+       acpi_sci=       [HW,ACPI] ACPI System Control Interrupt trigger mode
+                       Format: { level | edge |  high | low }
  
        acpi_irq_balance        [HW,ACPI] ACPI will balance active IRQs
                                default in APIC mode

diff --cc arch/i386/kernel/setup.c
Simple merge