tree 1308f4943207a303ff7069d159054af97dd2a6cf
parent 73efd00d473118297cc8ecbdd54429d5f6c6f241
parent 1430e17844e2cd15bc15f3c21b5349e762f6ba41
author Linus Torvalds <torvalds@linux-foundation.org> 1354301203 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1354301203 -0800

Merge branch 'akpm' (Fixes from Andrew)

Merge misc fixes from Andrew Morton:
 "Seven fixes, some of them fingers-crossed :("

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
  drivers/rtc/rtc-tps65910.c: fix invalid pointer access on _remove()
  mm: soft offline: split thp at the beginning of soft_offline_page()
  mm: avoid waking kswapd for THP allocations when compaction is deferred or contended
  revert "Revert "mm: remove __GFP_NO_KSWAPD""
  mm: vmscan: fix endless loop in kswapd balancing
  mm/vmemmap: fix wrong use of virt_to_page
  mm: compaction: fix return value of capture_free_page()