tree 2c440c3d4d9ed62f06a5eceda0a2b20f2d773307
parent 1eef1600af5f7404505f217513946e04c6b95718
parent a3512b2dd57cb653bb33645ca9c934436e547e3c
author Linus Torvalds <torvalds@linux-foundation.org> 1336586849 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1336586849 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/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