From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Feb 2015 18:57:29 +0000 (-0800)
Subject: Merge tag 'pm+acpi-3.19-fin' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e7394c776f22a8893e157842fe2ded100280a3a1;p=deliverable%2Flinux.git

Merge tag 'pm+acpi-3.19-fin' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI power management fix from Rafael  Wysocki:
 "This is a revert of an ACPI Low-power Subsystem (LPSS) driver change
  that was supposed to improve power management of the LPSS DMA
  controller, but introduced more serious problems.

  Since fixing them turns out to be non-trivial, it is better to revert
  the commit in question at this point and try to fix the original issue
  differently in the next cycle"

* tag 'pm+acpi-3.19-fin' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI / LPSS: introduce a 'proxy' device to power on LPSS for DMA"
---

e7394c776f22a8893e157842fe2ded100280a3a1