Merge branch 'merge'
Paul Mackerras [Tue, 8 Aug 2006 07:09:11 +0000 (17:09 +1000)]
1  2 
arch/powerpc/kernel/rtas.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/platforms/pseries/xics.c
drivers/char/hvsi.c
sound/aoa/core/snd-aoa-gpio-feature.c
sound/ppc/tumbler.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge