pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5d96218 d315760)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 9 Feb 2009 23:41:02 +0000 (00:41 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 9 Feb 2009 23:41:02 +0000 (00:41 +0100)
commit	92e2d508464b6293ad274fb606f766a458894142
tree	39bf383364530e5cdeacb205d32d69a4b78e253d	tree \| snapshot
parent	5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1	commit \| diff
parent	d315760ffa261c15ff92699ac6f514112543d7ca	commit \| diff

Merge branch 'x86/urgent' into core/percpu

Conflicts:
arch/x86/kernel/acpi/boot.c

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.cpu	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmi_32.c	diff1 \|	diff2 \|	blob \| history

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