Merge branch 'linus' into x86/core

Conflicts:

	arch/x86/mm/ioremap.c

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

diff --cc arch/x86/mm/ioremap.c
index 45e546c4ba78fc457a40c536b0244136b7239801,d1b867101e5f01e74d296e52cdbd0d4801dd43e5..115f13ee40c9156fc1f954d5181b415e97c78ed3
--- 1/arch/x86/mm/ioremap.c
--- 2/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@@ -365,7 -388,7 +388,7 @@@ void *xlate_dev_mem_ptr(unsigned long p
        if (page_is_ram(start >> PAGE_SHIFT))
                return __va(phys);
  
-       addr = (void __force *)ioremap(start, PAGE_SIZE);
 -      addr = (void *)ioremap_default(start, PAGE_SIZE);
++      addr = (void __force *)ioremap_default(start, PAGE_SIZE);
        if (addr)
                addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
  

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sched.c
Simple merge