[git pull] Please pull powerpc.git merge branch

Kumar Gala
2011-05-20T14:35:52Z

A bug/erratum fix, and a 2 long standing SRIO patches...

The following changes since commit 208b3a4c196e733b9cec006dc132cfc149b2810a:

powerpc: Fix hard CPU IDs detection (2011-05-20 17:50:18 +1000)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge

Shaohui Xie (2):
powerpc/fsl_rio: move machine_check handler
powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx

Shengzhou Liu (1):
powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum

arch/powerpc/include/asm/fsl_lbc.h | 2 +
arch/powerpc/include/asm/rio.h | 5 ++
arch/powerpc/kernel/traps.c | 13 +++++
arch/powerpc/sysdev/fsl_lbc.c | 9 +++-
arch/powerpc/sysdev/fsl_rio.c | 100 ++++++++++++++++++++++++++++-------
5 files changed, 107 insertions(+), 22 deletions(-)