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

	Commit message (Collapse)	Author	Age
*	Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵	Russell King	2010-07-29
\|\ \| \| \| \| \| \|	devel-stable
\| *	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 spi_imx devices (imx31)	Uwe Kleine-König	2010-06-30
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
\| \| *	ARM: mx3: remove paragraphs with old address of the FSF	Uwe Kleine-König	2010-06-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As the kernel contains a copy of the GPL anyhow just get rid of the address specification instead of fixing it. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
\| * \|	ARM: mx3: mx31lilly: pass mc13783 SPI IRQ pin	Daniel Mack	2010-07-26
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	This makes the resistive touch interface work. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* /	ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI	Daniel Mack	2010-07-01
\|/ \| \| \| \| \| \| \| \| \| \|	arch/arm/mach-mx3/built-in.o: In function `mx31lilly_board_init': mach-kzm_arm11_01.c:(.init.text+0x674): undefined reference to `otg_ulpi_create' mach-kzm_arm11_01.c:(.init.text+0x68c): undefined reference to `otg_ulpi_create' mach-kzm_arm11_01.c:(.init.text+0x744): undefined reference to `mxc_ulpi_access_ops' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
*	ARM: mx3/lilly1131: add USB support	Daniel Mack	2010-04-14
\| \| \| \| \| \|	Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
*	imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET	Uwe Kleine-König	2010-02-02
\| \| \| \| \| \| \|	This is a further step in allowing to build a kernel image for more than one imx SOC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	imx/mx3: rename files defining a machine to mach-$mach.c	Uwe Kleine-König	2010-01-08
	While at it remove some superfluous parenthesis. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Daniel Mack <daniel@caiaq.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>