Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 6 Dec 2010 08:36:17 +0000 (09:36 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 6 Dec 2010 08:36:17 +0000 (09:36 +0100)
commit0e44e059588e1d91f3a1974d2ce3348864d1d799
tree1161c2508bd9eeab010ebc40ef87860fd85a35fd
parent96886c4361f1ae3f6c775d7c9295e2d557101d0f
parente8a7e48bb248a1196484d3f8afa53bded2b24e71
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38

Done to resolve merge conflict:

Conflicts:
arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/devices-imx25.h
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
arch/arm/plat-mxc/devices/platform-imx-dma.c
arch/arm/plat-mxc/devices/platform-spi_imx.c