diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-18 12:43:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-18 12:43:46 -0400 |
| commit | f2f108eb4511f22a6f7568090cfcf4e7b2dc0f62 (patch) | |
| tree | 4b75771ec02543372808c7df31a1a65e37fdb361 /drivers | |
| parent | 756b0322e50aebc4b9afb4488a2d3f6c802b4e64 (diff) | |
| parent | 2b666ca4a68cbc22483b0f2e1ba3c0e59b01ae9e (diff) | |
Merge branch 'linus' into core/locking
Merge reason: Update to almost-final-.36
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers')
100 files changed, 770 insertions, 378 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index f7619600270a..af308d03f492 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c | |||
| @@ -204,6 +204,23 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { | |||
| 204 | }, | 204 | }, |
| 205 | }, | 205 | }, |
| 206 | { | 206 | { |
| 207 | /* | ||
| 208 | * There have a NVIF method in MSI GX723 DSDT need call by Nvidia | ||
| 209 | * driver (e.g. nouveau) when user press brightness hotkey. | ||
| 210 | * Currently, nouveau driver didn't do the job and it causes there | ||
| 211 | * have a infinite while loop in DSDT when user press hotkey. | ||
| 212 | * We add MSI GX723's dmi information to this table for workaround | ||
| 213 | * this issue. | ||
| 214 | * Will remove MSI GX723 from the table after nouveau grows support. | ||
| 215 | */ | ||
| 216 | .callback = dmi_disable_osi_vista, | ||
| 217 | .ident = "MSI GX723", | ||
| 218 | .matches = { | ||
| 219 | DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), | ||
| 220 | DMI_MATCH(DMI_PRODUCT_NAME, "GX723"), | ||
| 221 | }, | ||
| 222 | }, | ||
| 223 | { | ||
| 207 | .callback = dmi_disable_osi_vista, | 224 | .callback = dmi_disable_osi_vista, |
| 208 | .ident = "Sony VGN-NS10J_S", | 225 | .ident = "Sony VGN-NS10J_S", |
| 209 | .matches = { | 226 | .matches = { |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index b618f888d66b..bec561c14beb 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -346,4 +346,5 @@ void __init acpi_early_processor_set_pdc(void) | |||
| 346 | acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, | ||