Merge remote-tracking branch 'powerpc/next'

diff --cc arch/powerpc/kernel/irq.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

diff --cc fs/pstore/inode.c
Simple merge