git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 96886c4 e8a7e48)

author	Sascha Hauer <s.hauer@pengutronix.de>
	Mon, 6 Dec 2010 08:36:17 +0000 (09:36 +0100)
committer	Sascha Hauer <s.hauer@pengutronix.de>
	Mon, 6 Dec 2010 08:36:17 +0000 (09:36 +0100)
commit	0e44e059588e1d91f3a1974d2ce3348864d1d799
tree	1161c2508bd9eeab010ebc40ef87860fd85a35fd	tree \| snapshot (tar.gz zip)
parent	96886c4361f1ae3f6c775d7c9295e2d557101d0f	commit \| diff
parent	e8a7e48bb248a1196484d3f8afa53bded2b24e71	commit \| diff

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	diff1 \|	\|	blob \| history
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/devices/platform-imx-dma.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/devices/platform-spi_imx.c	diff1 \|	diff2 \|	blob \| history