]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5d1bc8753b10f3df47984d4f7458a082168f68bf
treec2997deab16bdc254f927edfa849d2a4dfb36092
parent3d0bc2ba96dd8bd74f3824d9d0a333f64b1a547e
parentc6c57a2039fc49a6b0362f5bc16495b2770434dd
Merge branch 'merge' of git://git.kernel.org/pub/scm/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