projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31fc835 3f937cf)
Merge tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Wed, 13 May 2015 14:17:33 +0000 (16:17 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 13 May 2015 14:17:33 +0000 (16:17 +0200)
commit6c28ab9fef9b4eca350d68ed0090f92fe37f969f
treee7f361fc83d13b7c7823abf925eb0365ad9e5fa0tree | snapshot
parent31fc835fc787aad38e8985d593f8ad0d18825323commit | diff
parent3f937cf3db466093c533efbcd601952509727a9dcommit | diff
Merge tag 'v4.1-rockchip-socfixes2' of git://git./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"
Domain: System / Kernel;