From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 17:17:30 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: firefly_0821_release~7613^2~1036
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45acab01ca6389371ec39e16844768a60f5f1380;p=firefly-linux-kernel-4.4.55.git

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
---

45acab01ca6389371ec39e16844768a60f5f1380