Merge branch 'cpuidle/4.7' of http://git.linaro.org/people/daniel.lezcano/linux into tmp

Browse source

Pull ARM cpuidle changes for v4.7 from Daniel Lezcano.

* 'cpuidle/4.7' of http://git.linaro.org/people/daniel.lezcano/linux:
  drivers: firmware: psci: use const and __initconst for psci_cpuidle_ops
  soc: qcom: spm: Use const and __initconst for qcom_cpuidle_ops
  ARM: cpuidle: constify return value of arm_cpuidle_get_ops()
  ARM: cpuidle: add const qualifier to cpuidle_ops member in structures

...

This commit is contained in:

Rafael J. Wysocki 2016-04-26 02:28:57 +02:00

parent 02da2d7217 5e7c17df79

commit b5ebbcdb53

4 changed files with 6 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm/include/asm/cpuidle.h

View file

6

arch/arm/kernel/cpuidle.c

View file

2

drivers/firmware/psci.c

View file

2

drivers/soc/qcom/spm.c

View file