diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 13:27:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 13:27:46 -0700 |
| commit | 50e6f8511a6b6a61611dae36794b5400cdc80ea1 (patch) | |
| tree | 07a73ce25a630f4a749215d0068612e0425e09e3 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'regmap-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap (diff) | |
| parent | xen/tmem: Don't over-write tmem_frontswap_poolid after tmem_frontswap_init set it. (diff) | |
| download | wireguard-linux-50e6f8511a6b6a61611dae36794b5400cdc80ea1.tar.xz wireguard-linux-50e6f8511a6b6a61611dae36794b5400cdc80ea1.zip | |
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.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions