aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/reboot.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-17 13:16:08 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-17 13:16:08 +0100
commit948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e (patch)
tree727c744438a44d85f7dc340b1bfcb3b127c84f13 /arch/x86/kernel/reboot.c
parent9466d6036f73481104039fbe99338baed11c8fea (diff)
parent17483a1f34c970e6c2cb8c082d4441bfabbe88a9 (diff)
Merge branch 'irq/sparseirq' into cpus4096
Conflicts: arch/x86/kernel/io_apic.c Merge irq/sparseirq here, to resolve conflicts.
Diffstat (limited to 'arch/x86/kernel/reboot.c')
0 files changed, 0 insertions, 0 deletions