Merge branch 'linus' into stackprotector
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:29 +0000 (12:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:29 +0000 (12:27 +0200)
commit5ce001b0e56638c726270d4f9e05d46d4250dfbb
treec21cf007ddef99d5e8b23dde9621bd9152e676a8
parent7c9f8861e6c9c839f913e49b98c3854daca18f27
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into stackprotector
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
arch/x86/kernel/process_64.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/sched.c