| commit | 6c28ab9fef9b4eca350d68ed0090f92fe37f969f | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed May 13 16:17:33 2015 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed May 13 16:17:33 2015 +0200 |
| tree | e7f361fc83d13b7c7823abf925eb0365ad9e5fa0 | |
| parent | 31fc835fc787aad38e8985d593f8ad0d18825323 [diff] | |
| parent | 3f937cf3db466093c533efbcd601952509727a9d [diff] |
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"