Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', 'x86...

diff --cc arch/blackfin/kernel/irqchip.c
Simple merge

diff --cc arch/x86/mm/ioremap.c
index 62773abdf088f589503a539ed8423b81bc16dfa8,62773abdf088f589503a539ed8423b81bc16dfa8,96786ef2c9a9d4247942cfb6b0f71014e7d5497c,62773abdf088f589503a539ed8423b81bc16dfa8,62def57957308fe60556e33c8dc92016e435f32d,f45d5e29a72edf4e15616d48c0d174f7905ac417,f45d5e29a72edf4e15616d48c0d174f7905ac417,433f7bd4648af4206fbc4afb0b2fd6b6dab59b6e..aca924a30ee6da36146acf1d86da367df04e7cc1
--- 1/arch/x86/mm/ioremap.c
--- 2/arch/x86/mm/ioremap.c
--- 3/arch/x86/mm/ioremap.c
--- 4/arch/x86/mm/ioremap.c
--- 5/arch/x86/mm/ioremap.c
--- 6/arch/x86/mm/ioremap.c
--- 7/arch/x86/mm/ioremap.c
--- 8/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@@@@@@@@ -85,8 -85,8 -85,8 -85,8 -85,10 -89,8 -89,8 -89,8 +85,10 @@@@@@@@@ bool __virt_addr_valid(unsigned long x
        {
                if (x < PAGE_OFFSET)
                        return false;
     ---        if (system_state != SYSTEM_BOOTING && is_vmalloc_addr((void *) x))
     +++        if (__vmalloc_start_set && is_vmalloc_addr((void *) x))
     +++                return false;
++++ +++        if (x >= FIXADDR_START)
++++                    return false;
                return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);
        }
        EXPORT_SYMBOL(__virt_addr_valid);

diff --cc kernel/softirq.c
Simple merge