]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.12' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 24 Sep 2013 20:22:51 +0000 (16:22 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 24 Sep 2013 20:22:51 +0000 (16:22 -0400)
* 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


Trivial merge