From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jun 2013 20:09:50 +0000 (-0700)
Subject: Merge tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=25e33ed9c711c8d64c403a17d4a2cdeac213800b;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'acpi-3.10-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "This is an alternative fix for the regression introduced in 3.9 whose
  previous fix had to be reverted right before 3.10-rc5, because it
  broke one of the Tony's machines.

  In this one the check is confined to the ACPI video driver (which is
  the only one causing the problem to happen in the first place) and the
  Tony's box shouldn't even notice it.

   - ACPI fix for an issue causing ACPI video driver to attempt to bind
     to devices it shouldn't touch from Rafael J Wysocki."

* tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / video: Do not bind to device objects with a scan handler
---

25e33ed9c711c8d64c403a17d4a2cdeac213800b