| commit | 82638844d9a8581bbf33201cc209a14876eca167 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jul 16 00:29:07 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jul 16 00:29:07 2008 +0200 |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 [diff] | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 [diff] |
Merge branch 'linus' into cpus4096 Conflicts: arch/x86/xen/smp.c kernel/sched_rt.c net/iucv/iucv.c Signed-off-by: Ingo Molnar <mingo@elte.hu>