]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 510b372 fb2e405)
Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Fri, 25 Jul 2008 11:08:16 +0000 (13:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 25 Jul 2008 11:08:16 +0000 (13:08 +0200)
commit10a010f6953b5a14ba2f0be40a4fce1bea220875
tree19aadf718c796bc7fae0a1a1c970d84d67c541d4tree | snapshot
parent510b37258dfd61693ca6c039865c78bd996e3718commit | diff
parentfb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43commit | diff
Merge branch 'linus' into x86/x2apic

Conflicts:

drivers/pci/dmar.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/genapic_flat_64.c diff1 | diff2 | blob | history
arch/x86/kernel/genx2apic_uv_x.c diff1 | diff2 | blob | history
arch/x86/kernel/io_apic_64.c diff1 | diff2 | blob | history
arch/x86/kernel/paravirt.c diff1 | diff2 | blob | history
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
arch/x86/xen/enlighten.c diff1 | diff2 | blob | history
include/asm-x86/ipi.h diff1 | diff2 | blob | history
include/asm-x86/paravirt.h diff1 | diff2 | blob | history
kernel/irq/manage.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.