Merge with Linus' kernel.
commit123656d4cc8c946f578ebd18c2050f5251720428
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 7 Jan 2006 14:40:05 +0000 (7 14:40 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 7 Jan 2006 14:40:05 +0000 (7 14:40 +0000)
tree3d5432eff034a3b9cfdc98b37e245abe5695342d
parenta62c80e559809e6c7851ec04d30575e85ad6f6ed
parent0aec63e67c69545ca757a73a66f5dcf05fa484bf
Merge with Linus' kernel.
arch/arm/common/amba.c
arch/arm/mach-pxa/mainstone.c
drivers/pcmcia/pxa2xx_sharpsl.c
sound/arm/aaci.c