summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-11 12:42:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-11 12:42:39 -0700
commit8daf4ded903a2e6e18d650861b354e43a3f8bf88 (patch)
tree0f3ba28ba1cbc02fa0b1ccedc81805e98317a739 /drivers/of
parent3dc352c02fa73728531765b4ca0f671c1e3be171 (diff)
parentdc332fdf9f373a87b1e2f423b5b004b2a3c37e1a (diff)
downloadlinux-8daf4ded903a2e6e18d650861b354e43a3f8bf88.tar.bz2
Merge tag 'pm-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "This removes ACPICA code that had already been removed once from the kernel already by commit 2780cc4660e1 ("[ACPI] Fix suspend/resume lockup issue by leaving Bus Master Arbitration enabled"), because it was known to cause systems to lock up during resume from suspend, but was re-introduced by mistake during the v3.4 merge window." * tag 'pm-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / PM: Leave Bus Master Arbitration enabled for suspend/resume
Diffstat (limited to 'drivers/of')
0 files changed, 0 insertions, 0 deletions