git.samba.org - sfrench/cifs-2.6.git/commit - arch/ppc/Kconfig

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 511d9d3 5b664cb)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 18 Jul 2008 20:50:34 +0000 (22:50 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 18 Jul 2008 20:50:34 +0000 (22:50 +0200)
commit	a208f37a465e222218974ab20a31b42b7b4893b2
tree	77c6acdd4be32024330a14f2618b814126ce7a20	tree
parent	511d9d34183662aada3890883e860b151d707e22	commit \| diff
parent	5b664cb235e97afbf34db9c4d77f08ebd725335e	commit \| diff

Merge branch 'linus' into x86/x2apic

17 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.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
drivers/pci/Makefile	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/smp.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.