Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull the 'merge' branch of the 4xx tree to pick up the fix below.
Once it's in Linus' tree, I'll submit it to -stable as we need the same
fix in .27.

josh

The following changes since commit feaf3848a813a106f163013af6fcf6c4bfec92d9:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

are available in the git repository at:

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

Grant Likely (1):
      powerpc/virtex5: Fix Virtex5 machine check handling

 arch/powerpc/kernel/cpu_setup_44x.S |    1 +
 arch/powerpc/kernel/cputable.c      |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)