Merge branch 'linus' into stackprotector
authorIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:31:57 +0000 (08:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:31:57 +0000 (08:31 +0100)
Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c


Trivial merge