From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 24 Sep 2013 20:22:51 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.12' into linux-next
X-Git-Tag: next-20130927~31^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=019ba86fd03126ba363242c16b5953bde38d6446;p=karo-tx-linux.git

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

* stable/for-linus-3.12:
  xen/p2m: check MFN is in range before using the m2p table
  xen/balloon: don't alloc page while non-preemptible
  xen: Do not enable spinlocks before jump_label_init() has executed
  tpm: xen-tpmfront: Remove the locality sysfs attribute
  tpm: xen-tpmfront: Fix default durations
---

019ba86fd03126ba363242c16b5953bde38d6446