diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 16:24:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 16:24:09 -0700 |
| commit | de74646c603fa71d1587f1ba5c761d009624abd7 (patch) | |
| tree | a9d521a4e13fddaa8c6703d7c4e255795235db15 /fs | |
| parent | a5e135122c9c5af9e63962e13159174c3aaea858 (diff) | |
| parent | 1c7e7f6c0703d03af6bcd5ccc11fc15d23e5ecbe (diff) | |
| download | linux-de74646c603fa71d1587f1ba5c761d009624abd7.tar.bz2 | |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions