Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 17:17:30 +0000 (10:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 17:17:30 +0000 (10:17 -0700)
commit45acab01ca6389371ec39e16844768a60f5f1380
treec2997deab16bdc254f927edfa849d2a4dfb36092
parentc0880dcded3ffe77700184e9d96c110ce0094c11
parent9693ebd4815eefa2b7c8fcc699061a0c8da0c1e7
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx
  powerpc/fsl_rio: move machine_check handler
  powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum