diff options
| author | Ingo Molnar | 2014-06-06 07:55:06 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2014-06-06 07:55:06 +0200 |
| commit | ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05 (patch) | |
| tree | c28975d7daf6d8a3aa23afe8f42837b71105b269 /kernel/hung_task.c | |
| parent | Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | perf: Fix perf_event_comm() vs. exec() assumption (diff) | |
| download | kernel-qcow2-linux-ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05.tar.gz kernel-qcow2-linux-ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05.tar.xz kernel-qcow2-linux-ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/hung_task.c')
0 files changed, 0 insertions, 0 deletions