Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mm/context.c
index c9e9a55862673023a819644ab6b2a8058383ecbd,9da43a0fdcdffc5ff09b4e8fd1bdf6d95ac0452b,930c04c4f53cb0a5843d201534d51840d6530673,9da43a0fdcdffc5ff09b4e8fd1bdf6d95ac0452b..fc84fcc743804d16241a99ee5cb1c86f650dd048
--- 1/arch/arm/mm/context.c
--- 2/arch/arm/mm/context.c
--- 3/arch/arm/mm/context.c
--- 4/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@@@@ -47,14 -47,7 -49,9 -47,7 +49,16 @@@@@ void __new_context(struct mm_struct *mm
                    : "r" (0));
                isb();
                flush_tlb_all();
 +++            if (icache_is_vivt_asid_tagged()) {
 +++                    asm("mcr        p15, 0, %0, c7, c5, 0   @ invalidate I-cache\n"
 +++                        "mcr        p15, 0, %0, c7, c5, 6   @ flush BTAC/BTB\n"
 +++                        :
 +++                        : "r" (0));
 +++                    dsb();
 +++            }
        }
++ +    spin_unlock(&cpu_asid_lock);
    
++ +    mm->cpu_vm_mask = cpumask_of_cpu(smp_processor_id());
        mm->context.id = asid;
    }

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/common.c
Simple merge