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: 98d9c66 0cfd810)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)
commit	3e10e879a8c334a5927d800a3663a24d562cfa31
tree	5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0	tree \| snapshot
parent	98d9c66ab07471006fd7910cb16453581c41a3e7	commit \| diff
parent	0cfd81031a26717fe14380d18275f8e217571615	commit \| diff

Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/init.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/module.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history

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