summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-25 16:55:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-25 16:55:37 -0700
commit15dbc136dff62ebefb03353cfb7d308d49b275f3 (patch)
tree9a475869d8249268213cd7874c111111611045df
parentdad44decc242a7ad185f1001541b0b7d49e2f58e (diff)
parent8e653b654497350f9cb3d6c2088207bc503f2c7c (diff)
downloadlinux-sh-15dbc136dff62ebefb03353cfb7d308d49b275f3.tar.gz
Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/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
-rw-r--r--[-rwxr-xr-x]drivers/power/avs/rockchip-io-domain.c0
1 files changed, 0 insertions, 0 deletions
diff --git a/drivers/power/avs/rockchip-io-domain.c b/drivers/power/avs/rockchip-io-domain.c
index 8986382718dd..8986382718dd 100755..100644
--- a/drivers/power/avs/rockchip-io-domain.c
+++ b/drivers/power/avs/rockchip-io-domain.c