litmus-rt.git - The LITMUS^RT kernel.

	Commit message (Collapse)	Author	Age
*	Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵	Uwe Kleine-König	2010-07-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into HEAD There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h
*	ARM: imx: dynamically register imx-uart devices (imx25)	Uwe Kleine-König	2010-06-30
\| \| \| \|	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: imx: Change the way nand devices are registered (imx25)	Uwe Kleine-König	2010-06-30
\| \| \| \| \| \|	Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch number	Uwe Kleine-König	2010-06-02
	Additionally document all known names of that machine. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>