Merge branch 'x86/urgent' into x86/core
authorIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:30:19 +0000 (16:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:30:19 +0000 (16:30 +0200)
Conflicts:

include/asm-x86/gpio.h

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

Trivial merge