Auto-update from upstream

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 61a56b100c62d287e05ec52c42636c6345159f14..06e362b2d5b8bb7321cac022685bba04e9c81da7 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1168,6 +1168,10 @@ running once the system is up.
                        Limit processor to maximum C-state
                        max_cstate=9 overrides any DMI blacklist limit.
 
+       processor.nocst [HW,ACPI]
+                       Ignore the _CST method to determine C-states,
+                       instead using the legacy FADT method
+
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.
                        See Documentation/ramdisk.txt.

diff --git a/Documentation/pm.txt b/Documentation/pm.txt
index 2ea1149bf6b044b7a77f5c70f7abe48863b60540..79c0f32a760e98ac60e1d8ca57f44cbcb3c33b99 100644 (file)
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
@@ -218,7 +218,7 @@ proceed in the opposite direction.
 Q: Who do I contact for additional information about
    enabling power management for my specific driver/device?
 
-ACPI Development mailing list: acpi-devel@lists.sourceforge.net
+ACPI Development mailing list: linux-acpi@vger.kernel.org
 
 System Interface -- OBSOLETE, DO NOT USE!
 ----------------*************************

diff --git a/MAINTAINERS b/MAINTAINERS
index cb536bbed9ffc9446df5e4c6089f1d9628c8c07e..a01b20ef7e8ac51609e36b624c12dc97511ef73f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -182,7 +182,7 @@ S:  Supported
 ACPI
 P:     Len Brown
 M:     len.brown@intel.com
-L:     acpi-devel@lists.sourceforge.net
+L:     linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 T:     git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:     Maintained

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a2bf25b05e1c08156d77571505e162c51fbc7075..31d4f3ffc265b5b2d28055ea1eaec5b317c8f5d4 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -37,7 +37,7 @@
 
 #define PREFIX                 "ACPI: "
 
-#define ACPI_MAX_TABLES                256
+#define ACPI_MAX_TABLES                128
 
 static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
        [ACPI_TABLE_UNKNOWN] = "????",
@@ -74,7 +74,7 @@ struct acpi_table_sdt {
 static unsigned long sdt_pa;   /* Physical Address */
 static unsigned long sdt_count;        /* Table count */
 
-static struct acpi_table_sdt sdt_entry[ACPI_MAX_TABLES];
+static struct acpi_table_sdt sdt_entry[ACPI_MAX_TABLES] __initdata;
 
 void acpi_table_print(struct acpi_table_header *header, unsigned long phys_addr)
 {