From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jun 2013 20:27:46 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50e6f8511a6b6a61611dae36794b5400cdc80ea1;p=linux-beck.git

Merge tag 'stable/for-linus-3.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull xen fixes from Konrad Rzeszutek Wilk:
 "Two bug-fixes for regressions:
   - xen/tmem stopped working after a certain combination of
     modprobe/swapon was used
   - cpu online/offlining would trigger WARN_ON."

* tag 'stable/for-linus-3.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/tmem: Don't over-write tmem_frontswap_poolid after tmem_frontswap_init set it.
  xen/smp: Fixup NOHZ per cpu data when onlining an offline CPU.
---

50e6f8511a6b6a61611dae36794b5400cdc80ea1