diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-20 10:34:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-20 10:34:22 +0100 |
| commit | 7f00a2495bf5b98b097c47be5d6e2d4114ec39bf (patch) | |
| tree | cf3a4b7a7de97347f9530485fbd9c16f9c0f7207 /arch/s390/include/asm/topology.h | |
| parent | c58603e81b3ed4f1c7352e091fe43fd0bd8d06cc (diff) | |
| parent | 71ff49d71bb5cfcd2689b54cb433c0e6990a1d86 (diff) | |
| parent | 5f641356127712fbdce0eee120e5ce115860c17f (diff) | |
| parent | 65c24491b4fef017c64e39ec64384fde5e05e0a0 (diff) | |
Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/core