tree 937b8c6fc8b28f6e556212c9deee726799f1f783
parent 1d567e19cc9810a9bd67b1ccab54b68d86dadb76
parent 5576646f3c1abd60d72d19829de6f5d8c2ca8ecf
author Linus Torvalds <torvalds@linux-foundation.org> 1353108398 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1353108398 -0800

Merge branch 'akpm' (Fixes from Andrew)

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (12 patches)
  revert "mm: fix-up zone present pages"
  tmpfs: change final i_blocks BUG to WARNING
  tmpfs: fix shmem_getpage_gfp() VM_BUG_ON
  mm: highmem: don't treat PKMAP_ADDR(LAST_PKMAP) as a highmem address
  mm: revert "mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures"
  rapidio: fix kernel-doc warnings
  swapfile: fix name leak in swapoff
  memcg: fix hotplugged memory zone oops
  mips, arc: fix build failure
  memcg: oom: fix totalpages calculation for memory.swappiness==0
  mm: fix build warning for uninitialized value
  mm: add anon_vma_lock to validate_mm()