| commit | 1c2a48cf65580a276552151eb8f78d78c55b828e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jan 07 14:14:15 2011 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jan 07 14:14:15 2011 +0100 |
| tree | 68ed0628a276b33cb5aa0ad4899c1afe0a33a69d | |
| parent | 0aa002fe602939370e9476e5ec32b562000a0425 [diff] | |
| parent | cb600d2f83c854ec3d6660063e4466431999489b [diff] |
Merge branch 'linus' into x86/apic-cleanups Conflicts: arch/x86/include/asm/io_apic.h Merge reason: Resolve the conflict, update to a more recent -rc base Signed-off-by: Ingo Molnar <mingo@elte.hu>