]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into tracing-v28-for-linus-v3
authorIngo Molnar <mingo@elte.hu>
Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)
commit3e10e879a8c334a5927d800a3663a24d562cfa31
tree5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0
parent98d9c66ab07471006fd7910cb16453581c41a3e7
parent0cfd81031a26717fe14380d18275f8e217571615
Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
arch/x86/Kconfig
include/asm-generic/vmlinux.lds.h
include/linux/init.h
include/linux/kernel.h
include/linux/module.h
init/Kconfig
kernel/exit.c
kernel/module.c