Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:18:26 +0000 (16:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:06:53 +0000 (18:06 +0200)
Conflicts:
arch/x86/kernel/process_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge