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)
commitae94b8075a2ed58d2318ef03827b25bc844f844e
tree7211f558d841cb40e1015d0b7527643ad55cb8e7
parenteca91e7838ec92e8c12122849ec7539c4765b689
parenta26929fb489188ff959b1715ee67f0c9f84405b5
Merge branch 'linus' into x86/core

Conflicts:

arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/ioremap.c
kernel/printk.c
kernel/sched.c