Merge branch 'x86/debug' into x86/irq
authorIngo Molnar <mingo@elte.hu>
Fri, 28 Nov 2008 14:00:37 +0000 (15:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 28 Nov 2008 14:00:48 +0000 (15:00 +0100)
commit3bdae4f46445ea7cc9ee031d7ff106fdc6228669
treea44b445548dbf730535cfebd024e4cabadd4397c
parent9f1e87ea3ecb3c46c21f6a1a202ec82f99ed2473
parent5f5db591326779a80cfe490c5d6b6ce9fac08b31
Merge branch 'x86/debug' into x86/irq

We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.
arch/x86/Kconfig
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S