[GIT PULL] pxa: 1 fix for zaurus resume

[Nicolas Pitre]

On Tue, 8 Sep 2009, Russell King - ARM Linux wrote:

> On Tue, Sep 08, 2009 at 12:09:58AM +0800, Eric Miao wrote:
> > This is a bit late, please consider this fix for zaurus resume in .31.
> 
> It's not late; the 19th August deadline was there to ensure that if the
> merge window opened while I was away, people wouldn't be complaining
> that stuff hadn't been merged.

In that case, could you pull this:

	git://git.marvell.com/orion for-rmk

It contains a single patch:

	[ARM] orion5x: Add LaCie NAS 2Big Network support

on top of what you already have.


Nicolas