Merge branch 'merge'

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

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/xics.c
Simple merge

diff --cc drivers/char/hvsi.c
Simple merge

diff --cc sound/aoa/core/snd-aoa-gpio-feature.c
Simple merge

diff --cc sound/ppc/tumbler.c
Simple merge