Merge with Linus' kernel.

diff --cc arch/arm/common/amba.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc drivers/pcmcia/pxa2xx_sharpsl.c
Simple merge

diff --cc sound/arm/aaci.c
Simple merge