SAFE public projects git trees. - safe/jmp/linux-2.6/commit

git://ftp.safe.ca / safe / jmp / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 742bd95 ecc25fb)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 26 Feb 2009 12:02:23 +0000 (13:02 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 26 Feb 2009 12:02:23 +0000 (13:02 +0100)
commit	8e818179eb9e8f9e44d8410dd2a25077d026a08e
tree	7d08afd30c95c04129c20693d974a18799caeb5a	tree \| snapshot
parent	742bd95ba96e19b3f7196c3a0834ebc17c8ba006	commit \| diff
parent	ecc25fbd6b9e07b33895c61ddf84006b00f55d99	commit \| diff

Merge branch 'x86/core' into perfcounters/core

Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c

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

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Full containers within linux kernel