[GIT PULL] pxa: 1 fix for zaurus resume

[GIT PULL] pxa: 1 fix for zaurus resume

[Eric Miao]

Russell,

This is a bit late, please consider this fix for zaurus resume in .31.

The following changes since commit 422bef879e84104fee6dc68ded0e371dbeb5f88e:
  Linus Torvalds (1):
        Linux 2.6.31-rc7

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git fix

Pavel Machek (1):
      [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume

 arch/arm/mach-pxa/sharpsl_pm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

[GIT PULL] pxa: 1 fix for zaurus resume

[Russell King - ARM Linux]

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.

Pulled.

[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