Merge branch 'misc' into release

This commit is contained in:
Len Brown
2009-04-05 01:52:07 -04:00
9 changed files with 43 additions and 26 deletions

View File

@@ -1548,7 +1548,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
/*
* If your system is blacklisted here, but you find that acpi=force
* works for you, please contact acpi-devel@sourceforge.net
* works for you, please contact linux-acpi@vger.kernel.org
*/
static struct dmi_system_id __initdata acpi_dmi_table[] = {
/*