| commit | ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Jun 06 07:55:06 2014 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Jun 06 07:55:06 2014 +0200 |
| tree | c28975d7daf6d8a3aa23afe8f42837b71105b269 | |
| parent | 8c6e549a447c51f4f8c0ba7f1e444469f75a354a [diff] | |
| parent | e041e328c4b41e1db79bfe5ba9992c2ed771ad19 [diff] |
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>