Merge tag 'ux500-fix-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2017 06:25:55 +0000 (22:25 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2017 06:25:55 +0000 (22:25 -0800)
commit941d3156e9a5d6826b17d451ccac876aa2f7a0d2
treeff66a9e5976cf6e78cfd5efcca1a17883671e289
parentdcde6b16eb6fda3f6434074e08b141c3d1f93308
parentf0e8faa7a5e894b0fc99d24be1b18685a92ea466
Merge tag 'ux500-fix-for-armsoc' of git://git./linux/kernel/git/linusw/linux-stericsson into fixes

A single PM fix from Arnd

* tag 'ux500-fix-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation

Signed-off-by: Olof Johansson <olof@lixom.net>