]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'akpm' (Fixes from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 21:07:55 +0000 (14:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 21:07:55 +0000 (14:07 -0700)
Merge misc fixes from Andrew Morton:
 "Seven fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
  lib/dma-debug.c: fix __hash_bucket_find()
  mm: compaction: correct the nr_strict va isolated check for CMA
  firmware/memmap: avoid type conflicts with the generic memmap_init()
  pidns: remove recursion from free_pid_ns()
  drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
  kernel/sys.c: fix stack memory content leak via UNAME26
  linux/coredump.h needs asm/siginfo.h


Trivial merge