From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Mar 2016 23:55:37 +0000 (-0700)
Subject: Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v4.14-rc1~3525
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15dbc136dff62ebefb03353cfb7d308d49b275f3;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pm+acpi-4.6-rc1-3' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixlet from Rafael Wysocki:
 "One of commits in my previous pull request changed the permissions of
  drivers/power/avs/rockchip-io-domain.c to executable by mistake"

* tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Fix permissions of drivers/power/avs/rockchip-io-domain.c
---

15dbc136dff62ebefb03353cfb7d308d49b275f3