From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 14 Feb 2013 14:27:11 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.9' into linux-next
X-Git-Tag: next-20130218~34^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2823bdaf662aa62c0a4a91d682e8f93e859ae6e;p=karo-tx-linux.git

Merge branch 'stable/for-linus-3.9' into linux-next

* stable/for-linus-3.9:
  xen/acpi: move xen_acpi_get_pxm under CONFIG_XEN_DOM0
  xen/acpi: ACPI cpu hotplug
  xen/acpi: Move xen_acpi_get_pxm to Xen's acpi.h
  xen/stub: driver for CPU hotplug
  xen/acpi: ACPI memory hotplug
  xen/stub: driver for memory hotplug
---

f2823bdaf662aa62c0a4a91d682e8f93e859ae6e