projects / linux-flexiantxendom0-3.2.10.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 1eef160 a3512b2)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 May 2012 18:07:29 +0000 (11:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 May 2012 18:07:29 +0000 (11:07 -0700)
commit6a5beacca8681fb6602649dd8cf5ba50a90befb3
tree2c440c3d4d9ed62f06a5eceda0a2b20f2d773307tree | snapshot
parent1eef1600af5f7404505f217513946e04c6b95718commit | diff
parenta3512b2dd57cb653bb33645ca9c934436e547e3ccommit | diff
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
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)