From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jul 2012 23:24:09 +0000 (-0700)
Subject: Merge branch 'akpm' (Andrew's patch-bomb)
X-Git-Tag: v5.15~22066
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=de74646c603fa71d1587f1ba5c761d009624abd7;p=mirror_ubuntu-kernels.git

Merge branch 'akpm' (Andrew's patch-bomb)

Merge Andrew's remaining patches for 3.5:
 "Nine fixes"

* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (9 commits)
  mm: fix lost kswapd wakeup in kswapd_stop()
  m32r: make memset() global for CONFIG_KERNEL_BZIP2=y
  m32r: add memcpy() for CONFIG_KERNEL_GZIP=y
  m32r: consistently use "suffix-$(...)"
  m32r: fix 'fix breakage from "m32r: use generic ptrace_resume code"' fallout
  m32r: fix pull clearing RESTORE_SIGMASK into block_sigmask() fallout
  m32r: remove duplicate definition of PTRACE_O_TRACESYSGOOD
  mn10300: fix "pull clearing RESTORE_SIGMASK into block_sigmask()" fallout
  bootmem: make ___alloc_bootmem_node_nopanic() really nopanic
---

de74646c603fa71d1587f1ba5c761d009624abd7