Merge branch 'merge'

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

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

diff --cc arch/powerpc/sysdev/mpic.c
Simple merge