]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.12' into HEAD
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 9 Sep 2013 16:09:55 +0000 (12:09 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 9 Sep 2013 16:09:55 +0000 (12:09 -0400)
* stable/for-linus-3.12:
  Revert "xen/spinlock: Disable IRQ spinlock (PV) allocation on PVHVM"
  xen/spinlock: Don't setup xen spinlock IPI kicker if disabled.
  xen/smp: Update pv_lock_ops functions before alternative code starts under PVHVM
  xen/spinlock: We don't need the old structure anymore
  xen/spinlock: Fix locking path engaging too soon under PVHVM.


Trivial merge