.31 acpi patches snuck in

diff --git a/review-2.6.31/acpi-add-dmi-entry-for-sci_en-resume-quirk-on-hp-dv4.patch b/review-2.6.31/acpi-add-dmi-entry-for-sci_en-resume-quirk-on-hp-dv4.patch
new file mode 100644 (file)
index 0000000..699ad01
--- /dev/null
+++ b/review-2.6.31/acpi-add-dmi-entry-for-sci_en-resume-quirk-on-hp-dv4.patch
@@ -0,0 +1,41 @@
+From 8a1cbf64977f89e9e9bc1d80dd01503337424f96 Mon Sep 17 00:00:00 2001
+From: Gustavo Maciel Dias Vieira <gustavo@sagui.org>
+Date: Mon, 19 Oct 2009 09:41:53 -0200
+Subject: ACPI: add DMI entry for SCI_EN resume quirk on HP dv4
+
+From: Gustavo Maciel Dias Vieira <gustavo@sagui.org>
+
+commit 8a1cbf64977f89e9e9bc1d80dd01503337424f96 upstream.
+
+Fixes the missing battery on sleep problem for yet another HP laptop
+("HP Pavilion dv4").
+
+Fixes:
+       http://bugzilla.kernel.org/show_bug.cgi?id=13449
+
+Signed-off-by: Gustavo Maciel Dias Vieira <gustavo@sagui.org>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Cc: Stefan Bader <stefan.bader@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/sleep.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -413,6 +413,14 @@ static struct dmi_system_id __initdata a
+               },
+       },
+       {
++      .callback = init_set_sci_en_on_resume,
++      .ident = "Hewlett-Packard Pavilion dv4",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++              DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"),
++              },
++      },
++      {
+       .callback = init_old_suspend_ordering,
+       .ident = "Panasonic CF51-2L",
+       .matches = {

diff --git a/review-2.6.31/acpi-dmi-init_set_sci_en_on_resume-for-hp-compaq-c700.patch b/review-2.6.31/acpi-dmi-init_set_sci_en_on_resume-for-hp-compaq-c700.patch
new file mode 100644 (file)
index 0000000..4f0d3e7
--- /dev/null
+++ b/review-2.6.31/acpi-dmi-init_set_sci_en_on_resume-for-hp-compaq-c700.patch
@@ -0,0 +1,38 @@
+From 87c687be055e67bc04189ce476690be73d16063e Mon Sep 17 00:00:00 2001
+From: Len Brown <len.brown@intel.com>
+Date: Mon, 23 Nov 2009 11:44:12 -0500
+Subject: ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700
+
+From: Len Brown <len.brown@intel.com>
+
+commit 87c687be055e67bc04189ce476690be73d16063e upstream.
+
+...else ACPI thermal controls fail after resume.
+
+http://bugzilla.kernel.org/show_bug.cgi?id=13745
+
+Signed-off-by: Len Brown <len.brown@intel.com>
+Cc: Stefan Bader <stefan.bader@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/sleep.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -430,6 +430,14 @@ static struct dmi_system_id __initdata a
+       },
+       {
+       .callback = init_set_sci_en_on_resume,
++      .ident = "Hewlett-Packard Compaq Presario C700 Notebook PC",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++              DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario C700 Notebook PC"),
++              },
++      },
++      {
++      .callback = init_set_sci_en_on_resume,
+       .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC",
+       .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

diff --git a/review-2.6.31/acpi-sleep-another-hp-compaq-dmi-entries-for-init_set_sci_en_on_resume.patch b/review-2.6.31/acpi-sleep-another-hp-compaq-dmi-entries-for-init_set_sci_en_on_resume.patch
new file mode 100644 (file)
index 0000000..a3044e2
--- /dev/null
+++ b/review-2.6.31/acpi-sleep-another-hp-compaq-dmi-entries-for-init_set_sci_en_on_resume.patch
@@ -0,0 +1,44 @@
+From 2839d396e3ae0891c1fdd87aa1cea218e6f5c4df Mon Sep 17 00:00:00 2001
+From: Vaibhav Verma <vaibhav.verma86@gmail.com>
+Date: Thu, 5 Nov 2009 23:13:36 -0500
+Subject: ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume
+
+From: Vaibhav Verma <vaibhav.verma86@gmail.com>
+
+commit 2839d396e3ae0891c1fdd87aa1cea218e6f5c4df upstream.
+
+http://bugzilla.kernel.org/show_bug.cgi?id=13745
+
+Signed-off-by: Len Brown <len.brown@intel.com>
+Cc: Stefan Bader <stefan.bader@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/sleep.c |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -421,6 +421,22 @@ static struct dmi_system_id __initdata a
+               },
+       },
+       {
++      .callback = init_set_sci_en_on_resume,
++      .ident = "Hewlett-Packard Pavilion dv7",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++              DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"),
++              },
++      },
++      {
++      .callback = init_set_sci_en_on_resume,
++      .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++              DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario CQ40 Notebook PC"),
++              },
++      },
++      {
+       .callback = init_old_suspend_ordering,
+       .ident = "Panasonic CF51-2L",
+       .matches = {

diff --git a/review-2.6.31/acpi-sleep-another-hp-dmi-entry-for-init_set_sci_en_on_resume.patch b/review-2.6.31/acpi-sleep-another-hp-dmi-entry-for-init_set_sci_en_on_resume.patch
new file mode 100644 (file)
index 0000000..c1906e9
--- /dev/null
+++ b/review-2.6.31/acpi-sleep-another-hp-dmi-entry-for-init_set_sci_en_on_resume.patch
@@ -0,0 +1,38 @@
+From eb0ca849863ecdc593ba7faa95fda5695af891c8 Mon Sep 17 00:00:00 2001
+From: Len Brown <len.brown@intel.com>
+Date: Sat, 29 Aug 2009 22:39:06 -0400
+Subject: ACPI: sleep: another HP DMI entry for init_set_sci_en_on_resume
+
+From: Len Brown <len.brown@intel.com>
+
+commit eb0ca849863ecdc593ba7faa95fda5695af891c8 upstream.
+
+DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC")
+
+http://bugzilla.kernel.org/show_bug.cgi?id=13745
+
+Signed-off-by: Len Brown <len.brown@intel.com>
+Cc: Stefan Bader <stefan.bader@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/sleep.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -405,6 +405,14 @@ static struct dmi_system_id __initdata a
+               },
+       },
+       {
++      .callback = init_set_sci_en_on_resume,
++      .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++              DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
++              },
++      },
++      {
+       .callback = init_old_suspend_ordering,
+       .ident = "Panasonic CF51-2L",
+       .matches = {

diff --git a/review-2.6.31/series b/review-2.6.31/series
index 9fbe1dcc52d9963f115b2e17b3e1cf40f2263d3f..f96c825c02e2b2f269c48df9f637d625ee7d1216 100644 (file)
--- a/review-2.6.31/series
+++ b/review-2.6.31/series
@@ -7,3 +7,7 @@ quota-fix-dquot_transfer-for-filesystems-different-from-ext4.patch
 fix-braindamage-in-audit_tree.c-untag_chunk.patch
 fix-more-leaks-in-audit_tree.c-tag_chunk.patch
 ipv6-skb_dst-can-be-null-in-ipv6_hop_jumbo.patch
+acpi-sleep-another-hp-dmi-entry-for-init_set_sci_en_on_resume.patch
+acpi-add-dmi-entry-for-sci_en-resume-quirk-on-hp-dv4.patch
+acpi-sleep-another-hp-compaq-dmi-entries-for-init_set_sci_en_on_resume.patch
+acpi-dmi-init_set_sci_en_on_resume-for-hp-compaq-c700.patch