From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 May 2012 18:07:29 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: firefly_0821_release~3680^2~2931
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a5beacca8681fb6602649dd8cf5ba50a90befb3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc fixes from Benjamin Herrenschmidt:
 "Here are a couple of last minute fixes for 3.4 for regressions
  introduced by my rewrite of the lazy irq masking code."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/irq: Make alignment & program interrupt behave the same
  powerpc/irq: Fix bug with new lazy IRQ handling code
---

6a5beacca8681fb6602649dd8cf5ba50a90befb3