From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Mar 2019 17:09:11 +0000 (-0700)
Subject: Merge tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: ceph-for-5.1-rc7~115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=782492a7a4807317319a0b1832594d07ba79747d;p=ceph-client.git

Merge tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "This corrects a previous attempt to make Linux use its own set of ACPI
  debug flags different from the upstream ACPICA's default (Erik
  Schmauss)"

* tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: use different default debug value than ACPICA
---

782492a7a4807317319a0b1832594d07ba79747d