| commit | 948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Dec 17 13:16:08 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Dec 17 13:16:08 2008 +0100 |
| tree | 727c744438a44d85f7dc340b1bfcb3b127c84f13 | |
| parent | 9466d6036f73481104039fbe99338baed11c8fea [diff] | |
| parent | 17483a1f34c970e6c2cb8c082d4441bfabbe88a9 [diff] |
Merge branch 'irq/sparseirq' into cpus4096 Conflicts: arch/x86/kernel/io_apic.c Merge irq/sparseirq here, to resolve conflicts.