]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f1e87e 5f5db59)
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
treea44b445548dbf730535cfebd024e4cabadd4397ctree | snapshot
parent9f1e87ea3ecb3c46c21f6a1a202ec82f99ed2473commit | diff
parent5f5db591326779a80cfe490c5d6b6ce9fac08b31commit | diff
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 diff1 | diff2 | blob | history
arch/x86/kernel/entry_32.S diff1 | diff2 | blob | history
arch/x86/kernel/entry_64.S diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.