Merge branch 'origin' into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Mar 2010 20:21:04 +0000 (20:21 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Mar 2010 20:21:04 +0000 (20:21 +0000)
commit988addf82e4c03739375279de73929580a2d4a6a
tree989ae1cd4e264bbad80c65f04480486246e7b9f3
parent004c1c7096659d352b83047a7593e91d8a30e3c5
parent25cf84cf377c0aae5dbcf937ea89bc7893db5176
Merge branch 'origin' into devel-stable

Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
23 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-mx2/clock_imx21.c
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
arch/arm/mach-mx25/clock.c
arch/arm/mach-mx3/clock-imx31.c
arch/arm/mach-mx3/clock-imx35.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-s5pc100/include/mach/vmalloc.h
arch/arm/mach-s5pv210/include/mach/debug-macro.S
arch/arm/plat-mxc/Makefile
arch/arm/plat-mxc/include/mach/debug-macro.S
drivers/Makefile
drivers/mtd/nand/Kconfig
drivers/serial/Kconfig
drivers/serial/imx.c
drivers/sh/intc.c
drivers/usb/gadget/s3c-hsotg.c
sound/soc/pxa/pxa-ssp.c
sound/soc/s3c24xx/s3c64xx-i2s.c