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: 3a450de 16b71fd)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 11 Mar 2009 09:29:28 +0000 (10:29 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 11 Mar 2009 09:29:28 +0000 (10:29 +0100)
commit	1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935
tree	12df0f2e25e95654156b2900bd6df1abb3c2e87a	tree \| snapshot
parent	3a450de1365d20afde406f0d9b2931a5e4a4fd6a	commit \| diff
parent	16b71fdf97599f1b1b7f38418ee9922d9f117396	commit \| diff

Merge branch 'linus' into core/percpu

Conflicts:
arch/x86/include/asm/fixmap_64.h

13 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/blackfin/kernel/irqchip.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/reboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	diff1 \|	diff2 \|	blob \| history

Full containers within linux kernel