Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Tue, 8 Aug 2006 07:09:11 +0000 (17:09 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 8 Aug 2006 07:09:11 +0000 (17:09 +1000)
commit32bc6e095d75233e7c87cc6fa0e07942b124d194
tree8f83ef9a23d52d1305878b65dd98fc22b09b7f3e
parent5cf13911b1e72707b6f0eb39b2d819ec6e343d76
parent81b73dd92b97423b8f5324a59044da478c04f4c4
Merge branch 'merge'
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