| commit | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Jul 08 09:53:57 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Jul 08 09:53:57 2008 +0200 |
| tree | 9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2 | |
| parent | 58cf35228fec541418cc3bd781d6c069d904815e [diff] | |
| parent | cbd6712406a3ea861b49fbfd46e23cbf5f8e073f [diff] |
Merge branch 'x86/irq' into x86/devel Conflicts: arch/x86/kernel/i8259.c arch/x86/kernel/irqinit_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>