git.oblomov.eu Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7ab6af7 796aade)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 11 Aug 2008 09:19:20 +0000 (11:19 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 11 Aug 2008 09:19:20 +0000 (11:19 +0200)
commit	8067794bec1cc5de1431102cf0a6a1c7ce75cd85
tree	2bfa0fba060d253bbd972282b29a3d60c3e7cb7f	tree \| snapshot
parent	7ab6af7ab69df8c9c5fbc380004fb81187742096	commit \| diff
parent	796aadeb1b2db9b5d463946766c5bbfd7717158c	commit \| diff

Merge branch 'linus' into x86/x2apic

Conflicts:

arch/x86/kernel/genapic_64.c

Manual merge:

arch/x86/kernel/genx2apic_uv_x.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers