pxa-devel back-merge / cherry pick request

[Russell King - ARM Linux]

On Mon, May 31, 2010 at 01:48:16PM +0200, Daniel Mack wrote:
> Hi Eric,
> 
> Is there any plans to merge Linus' tree into your pxa-devel any time
> soon? I'm asking because I have one patch pending which depends on
> 
>   a3bcbbee ("pda_power: Add function callbacks for suspend and resume")
> 
> upstream. Alternatively, could you cherry-pick this one commit?

Please don't cherry-pick commits back into branches which will eventually
find their way back into mainline.