diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:53:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:53:57 +0200 |
| commit | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (patch) | |
| tree | 9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2 /COPYING | |
| parent | Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile', 'x86/debu... (diff) | |
| parent | Merge branch 'linus' into x86/irq (diff) | |
| download | linux-1b8ba39a3fad9c58532f6dad12c94d6e675be656.tar.xz linux-1b8ba39a3fad9c58532f6dad12c94d6e675be656.zip | |
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>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions