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

15dbc136 · Linus Torvalds <[email protected]> · 2016-03-25 16:55:37 -07:00

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

Commit

15dbc136dff62ebefb03353cfb7d308d49b275f3

Parents

dad44dec · 8e653b65

Merge commit. Changes below are compared with the first parent: dad44dec.

Changes

1 files changed · +0 −0