diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 16:06:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 16:06:09 +0200 |
| commit | ebf546cc5391b9a8a17c1196b05b4357ef0138a2 (patch) | |
| tree | 8ee8a9c1ef57710a07290228883db7ca742bf835 /kernel/watchdog.c | |
| parent | 9d9420f1209a1facea7110d549ac695f5aeeb503 (diff) | |
| parent | 9c2b9d30e28559a78c9e431cdd7f2c6bf5a9ee67 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two leftover fixes from the v3.17 cycle - these will be forwarded to
stable as well, if they prove problem-free in wider testing as well"
[ Side note: the "fix perf bug in fork()" fix had also come in through
Andrew's patch-bomb - Linus ]
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix perf bug in fork()
perf: Fix unclone_ctx() vs. locking
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions