[GIT PULL] ARM: rockchip: fixup duplicate suspend fix

[Arnd Bergmann]

On Wednesday 13 May 2015 16:17:24 Heiko Stuebner wrote:
> Hi Arnd, Olof,
> 
> it looks like I got confused when going through the patches fixing suspend
> issues and from the two of them only one is actually necessary, as both fix
> the same symptom. Thankfully Chris pointed out this issue and also
> confirmed which patch should actually be kept. So this pull-req reverts the
> other (obsolete) one.
> 
> Sorry for the mess-up.
> 

Pulled into the fixes branch, thanks!

	Arnd