diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 06:25:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 06:25:17 +0100 |
| commit | c41b3810c09e60664433548c5218cc6ece6a8903 (patch) | |
| tree | cf9d822e3216d57a0ba3a184e9d586ad7bdf370c /fs/attr.c | |
| parent | Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge branch 'acpi-pm' into fixes (diff) | |
| download | linux-c41b3810c09e60664433548c5218cc6ece6a8903.tar.xz linux-c41b3810c09e60664433548c5218cc6ece6a8903.zip | |
Merge tag 'pm+acpi-fixes-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki:
- Fixes for blackfin and microblaze build problems introduced by the
removal of global pm_idle. From Lars-Peter Clausen.
- OPP core build fix from Shawn Guo.
- Error condition check fix for the new imx6q-cpufreq driver from Wei
Yongjun.
- Fix for an AER driver crash related to the lack of APEI
initialization for acpi=off. From Rafael J Wysocki.
- Fix for a USB breakage on Thinkpad T430 related to ACPI power
resources and PCI wakeup from Rafael J. Wysocki.
* tag 'pm+acpi-fixes-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / PM: Take unusual configurations of power resources into account
imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()
PM / OPP: fix condition for empty of_init_opp_table()
ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off
microblaze idle: Fix compile error
blackfin idle: Fix compile error
Diffstat (limited to 'fs/attr.c')
0 files changed, 0 insertions, 0 deletions