| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Jun 11 17:55:42 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Jun 11 17:55:42 2009 +0200 |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 [diff] | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d [diff] |
Merge branch 'linus' into perfcounters/core Conflicts: arch/x86/kernel/irqinit.c arch/x86/kernel/irqinit_64.c arch/x86/kernel/traps.c arch/x86/mm/fault.c include/linux/sched.h kernel/exit.c