diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-09 11:07:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-09 11:07:29 -0700 |
| commit | 6a5beacca8681fb6602649dd8cf5ba50a90befb3 (patch) | |
| tree | 2c440c3d4d9ed62f06a5eceda0a2b20f2d773307 /arch/x86/kernel | |
| parent | Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
| parent | powerpc/irq: Make alignment & program interrupt behave the same (diff) | |
| download | linux-dev-6a5beacca8681fb6602649dd8cf5ba50a90befb3.tar.xz linux-dev-6a5beacca8681fb6602649dd8cf5ba50a90befb3.zip | |
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
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions