diff options
| author | Len Brown <len.brown@intel.com> | 2011-08-02 23:22:09 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-02 23:22:09 +0200 |
| commit | 4a8f5058bde15d737abe39b5bed3f21dcb6599d2 (patch) | |
| tree | 5e4fc5e59d4393fd08852665a6da1ecbbfd0d8b3 /include/acpi | |
| parent | ACPICA: Update to version 20110623 (diff) | |
| parent | ACPI / Battery: propagate sysfs error in acpi_battery_add() (diff) | |
| parent | ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS (diff) | |
| parent | ACPI / SBS: Correct the value of power_now and power_avg in the sysfs (diff) | |
| parent | ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX (diff) | |
| parent | ACPI: add missing _OSI strings (diff) | |
| parent | ACPI: introduce "acpi_rsdp=" parameter for kdump (diff) | |
| parent | ACPI: delete stale reference in kernel-parameters.txt (diff) | |
| download | linux-4a8f5058bde15d737abe39b5bed3f21dcb6599d2.tar.xz linux-4a8f5058bde15d737abe39b5bed3f21dcb6599d2.zip | |
Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm', 'kexec-param' and 'misc' into release
Conflicts:
Documentation/kernel-parameters.txt
Signed-off-by: Len Brown <len.brown@intel.com>