From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2014 23:40:31 +0000 (-0700)
Subject: Merge branch 'akpm' (incoming from Andrew)
X-Git-Tag: submit/tizen/20160607.132125~4712
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea2388f2813ec7871c40a8b18afb80b5674d6e1d;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'akpm' (incoming from Andrew)

Merge misc fixes from Andrew Morton:
 "13 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  thp: close race between split and zap huge pages
  mm: fix new kernel-doc warning in filemap.c
  mm: fix CONFIG_DEBUG_VM_RB description
  mm: use paravirt friendly ops for NUMA hinting ptes
  mips: export flush_icache_range
  mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
  wait: explain the shadowing and type inconsistencies
  Shiraz has moved
  Documentation/vm/numa_memory_policy.txt: fix wrong document in numa_memory_policy.txt
  powerpc/mm: fix ".__node_distance" undefined
  kernel/watchdog.c:touch_softlockup_watchdog(): use raw_cpu_write()
  init/Kconfig: move the trusted keyring config option to general setup
  vmscan: reclaim_clean_pages_from_list() must use mod_zone_page_state()
---

ea2388f2813ec7871c40a8b18afb80b5674d6e1d