From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 18 Dec 2012 04:38:50 +0000 (-0500)
Subject: Merge commit '74b84233458e9db7c160cec67638efdbec748ca9' into linux-next
X-Git-Tag: next-20130218~34^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9736dea1be21e5ba87bd453b94f02be474b589dc;p=karo-tx-linux.git

Merge commit '74b84233458e9db7c160cec67638efdbec748ca9' into linux-next

* commit '74b84233458e9db7c160cec67638efdbec748ca9': (2960 commits)
  memory_hotplug: ensure every online node has NORMAL memory
  memory_hotplug: handle empty zone when online_movable/online_kernel
  mm, memory-hotplug: dynamic configure movable memory and portion memory
  drivers/base/node.c: cleanup node_state_attr[]
  bootmem: fix wrong call parameter for free_bootmem()
  avr32, kconfig: remove HAVE_ARCH_BOOTMEM
  mm: cma: remove watermark hacks
  mm: cma: skip watermarks check for already isolated blocks in split_free_page()
  mm, oom: fix race when specifying a thread as the oom origin
  mm, oom: change type of oom_score_adj to short
  mm: cleanup register_node()
  mm, mempolicy: remove duplicate code
  mm/vmscan.c: try_to_freeze() returns boolean
  mm: introduce putback_movable_pages()
  virtio_balloon: introduce migration primitives to balloon pages
  mm: introduce compaction and migration for ballooned pages
  mm: introduce a common interface for balloon pages mobility
  mm: redefine address_space.assoc_mapping
  mm: adjust address_space_operations.migratepage() return code
  arch/sparc/kernel/sys_sparc_64.c: s/COLOUR/COLOR/
  ...
---

9736dea1be21e5ba87bd453b94f02be474b589dc