Merge with Linus' kernel.
Russell King [Sat, 7 Jan 2006 14:40:05 +0000 (14:40 +0000)]
1  2 
arch/arm/common/amba.c
arch/arm/mach-pxa/mainstone.c
drivers/pcmcia/pxa2xx_sharpsl.c
sound/arm/aaci.c

Simple merge
Simple merge
Simple merge
Simple merge