Please pull 'merge' branch of the 4xx tree

[Josh Boyer]

Hi Paul,

Please pull the following two commits for 2.6.30.  One is a
trivial MAINTAINERS fix, the other fixes a bug that computes
the memory size of some 4xx boards incorrectly.

The following changes since commit 6329db8bd60fbc0832f30c350b0181b8d865573e:
  Bartlomiej Zolnierkiewicz (1):
        powerpc: Fix modular build of ide-pmac when mediabay is built in

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Josh Boyer (1):
      maintainers: Fix PowerPC 4xx git tree

Valentine Barshak (1):
      powerpc/44x: Correct memory size calculation for denali-based boards

 MAINTAINERS             |    2 +-
 arch/powerpc/boot/4xx.c |   56 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 14 deletions(-)


josh