| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jan 31 17:32:31 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Feb 05 22:30:01 2009 +0100 |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 [diff] | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c [diff] |
Merge branch 'x86/urgent' into x86/apic Conflicts: arch/x86/mach-default/setup.c Semantic merge: arch/x86/kernel/irqinit_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>