Merge branch 'linus' into x86/core
authorIngo Molnar <mingo@elte.hu>
Sat, 12 Jul 2008 05:29:02 +0000 (07:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 12 Jul 2008 05:29:02 +0000 (07:29 +0200)
Conflicts:

arch/x86/mm/ioremap.c

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

Trivial merge