From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jan 2014 22:40:38 +0000 (-0800)
Subject: Merge branch 'akpm' (incoming from Andrew)
X-Git-Tag: v3.13-rc7~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06f055f394da2364b944d41b9609589763ae762a;p=kernel%2Fkernel-generic.git

Merge branch 'akpm' (incoming from Andrew)

Merge patches from Andrew Morton:
 "Ten fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  epoll: do not take the nested ep->mtx on EPOLL_CTL_DEL
  sh: add EXPORT_SYMBOL(min_low_pfn) and EXPORT_SYMBOL(max_low_pfn) to sh_ksyms_32.c
  drivers/dma/ioat/dma.c: check DMA mapping error in ioat_dma_self_test()
  mm/memory-failure.c: transfer page count from head page to tail page after split thp
  MAINTAINERS: set up proper record for Xilinx Zynq
  mm: remove bogus warning in copy_huge_pmd()
  memcg: fix memcg_size() calculation
  mm: fix use-after-free in sys_remap_file_pages
  mm: munlock: fix deadlock in __munlock_pagevec()
  mm: munlock: fix a bug where THP tail page is encountered
---

06f055f394da2364b944d41b9609589763ae762a