diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 03:53:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 03:53:57 -0400 |
| commit | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (patch) | |
| tree | 9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2 /include/asm-x86/mtrr.h | |
| 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>
Diffstat (limited to 'include/asm-x86/mtrr.h')
0 files changed, 0 insertions, 0 deletions