diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-15 00:21:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-15 00:21:25 +0100 |
| commit | ebf4bcbd5f249afc8f48a7aa32255f8ebbff5876 (patch) | |
| tree | 47fdb196fc109411d4524bf2c25d88a6d5470477 /scripts/mod/modpost.c | |
| parent | Merge tag 'mmc-fixes-for-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | powerpc/pseries/eeh: Fix crash when error happens during device probe (diff) | |
| download | linux-ebf4bcbd5f249afc8f48a7aa32255f8ebbff5876.tar.xz linux-ebf4bcbd5f249afc8f48a7aa32255f8ebbff5876.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Quoth BenH:
"Here are a few powerpc fixes for 3.3, all pretty trivial. I also
added the patch to define GET_IP/SET_IP so we can use some more
asm-generic goodness."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pseries/eeh: Fix crash when error happens during device probe
powerpc/pseries: Fix partition migration hang in stop_topology_update
powerpc/powernv: Disable interrupts while taking phb->lock
powerpc: Fix WARN_ON in decrementer_check_overflow
powerpc/wsp: Fix IRQ affinity setting
powerpc: Implement GET_IP/SET_IP
powerpc/wsp: Permanently enable PCI class code workaround
Diffstat (limited to 'scripts/mod/modpost.c')
0 files changed, 0 insertions, 0 deletions