From: Arnd Bergmann Date: Wed, 13 May 2015 14:17:33 +0000 (+0200) Subject: Merge tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.13~5207^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6c28ab9fef9b4eca350d68ed0090f92fe37f969f;p=mirror_ubuntu-bionic-kernel.git Merge tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes The previous two suspend related fixes both fix the same issue so only one of them (the newer one) is actually needed. * tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs" --- 6c28ab9fef9b4eca350d68ed0090f92fe37f969f