Merge tag 'v3.10' into next

Merge 3.10 in order to get some of the last minute powerpc
changes, resolve conflicts and add additional fixes on top
of them.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/include/asm/exception-64s.h
Simple merge

diff --cc arch/powerpc/kernel/eeh_cache.c
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

diff --cc arch/sparc/mm/tlb.c
Simple merge