From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Oct 2015 02:20:11 +0000 (-0400)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: MMI-PSA29.97-13-9~9286
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bde17b90dd9712cb61a7ab0c1ccd0f7f6aa57957;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "12 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  dmapool: fix overflow condition in pool_find_page()
  thermal: avoid division by zero in power allocator
  memcg: remove pcp_counter_lock
  kprobes: use _do_fork() in samples to make them work again
  drivers/input/joystick/Kconfig: zhenhua.c needs BITREVERSE
  memcg: make mem_cgroup_read_stat() unsigned
  memcg: fix dirty page migration
  dax: fix NULL pointer in __dax_pmd_fault()
  mm: hugetlbfs: skip shared VMAs when unmapping private pages to satisfy a fault
  mm/slab: fix unexpected index mapping result of kmalloc_size(INDEX_NODE+1)
  userfaultfd: remove kernel header include from uapi header
  arch/x86/include/asm/efi.h: fix build failure
---

bde17b90dd9712cb61a7ab0c1ccd0f7f6aa57957