diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 10:16:10 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 10:16:10 +0100 |
commit | 148b00b63a3f747141207e7a409f14bd26d0820f (patch) | |
tree | e88b52035d193517536087692583a5ec194d5ee0 /mm/slob.c | |
parent | Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security (diff) | |
parent | powerpc/signal32: Fix sigset_t conversion when copying to user (diff) | |
download | linux-148b00b63a3f747141207e7a409f14bd26d0820f.tar.xz linux-148b00b63a3f747141207e7a409f14bd26d0820f.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/signal32: Fix sigset_t conversion when copying to user
powerpc: Fix atomic_xxx_return barrier semantics
powerpc: Remove buggy 9-year-old test for binutils < 2.12.1
powerpc/book3e-64: Fix debug support for userspace
powerpc: Remove extraneous CONFIG_PPC_ADV_DEBUG_REGS define
powerpc: Revert show_regs() define for readability
powerpc/ps3: Fix SMP lockdep boot warning
powerpc/ps3: Fix lost SMP IPIs
powerpc: Add hvcall.h include to book3s_hv.c
powerpc/trace: Add a dummy stack frame for trace_hardirqs_off
powerpc: Copy down exception vectors after feature fixups
powerpc: panic if we can't instantiate RTAS
powerpc/4xx: Fix typos in kexec config dependencies
powerpc/fsl: MCU_MPC8349EMITX wants I2C built-in, modular won't do...
powerpc/fsl_udc_core: Fix dumb typo
carma-fpga: Missed switch from of_register_platform_driver()
powerpc: Fix build breakage in jump_label.c
Diffstat (limited to 'mm/slob.c')
0 files changed, 0 insertions, 0 deletions