Merge tag 'v4.3-rockchip32-soc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Aug 2015 17:16:48 +0000 (10:16 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Aug 2015 17:16:48 +0000 (10:16 -0700)
commit1ec6f701707e4e97e451ff8b662360f1262a6c59
treeef91c88ec4be315debbde0867a40b852772e8444
parent6be4b0da4ecf1472cb4a064c752214dcb2ba4be2
parent2a03c025fdea25a491c359b31d8a8c8d452b06d0
Merge tag 'v4.3-rockchip32-soc3' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc

Fix for wrong error-codes in rk3288 suspend code.

* tag 'v4.3-rockchip32-soc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: pm: Fix PTR_ERR() argument

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