| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Sep 15 12:18:15 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Sep 15 12:18:15 2009 +0200 |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf [diff] | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 [diff] |
Merge branch 'linus' into tracing/hw-breakpoints Conflicts: arch/x86/kernel/process_64.c Semantic conflict fixed in: arch/x86/kvm/x86.c Signed-off-by: Ingo Molnar <mingo@elte.hu>