From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jul 2012 19:42:39 +0000 (-0700)
Subject: Merge tag 'pm-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~3680^2~2487
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8daf4ded903a2e6e18d650861b354e43a3f8bf88;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pm-for-3.5-rc7' of git://git./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
---

8daf4ded903a2e6e18d650861b354e43a3f8bf88