pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4f962d4 278429c)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 15 Oct 2008 11:46:29 +0000 (13:46 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 15 Oct 2008 11:46:29 +0000 (13:46 +0200)
commit	b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40
tree	53ccb1c2c14751fe69cf93102e76e97021f6df07	tree \| snapshot
parent	4f962d4d65923d7b722192e729840cfb79af0a5a	commit \| diff
parent	278429cff8809958d25415ba0ed32b59866ab1a8	commit \| diff

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h

15 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pda.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/system.h	diff1 \|	diff2 \|	blob \| history
include/linux/magic.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/panic.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

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