asmadeus/linux.git - The linux kernel

Age	Commit message (Collapse)	Author
2010-07-26	Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵	Uwe Kleine-König
	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
2010-06-30	ARM: imx: dynamically register imx-uart devices (imx27)	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: dynamically register imx-uart devices (imx21)	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: dynamically register imx-uart devices (imx1)	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: dynamically register spi_imx devices (imx27)	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: dynamically register imx-i2c devices (imx27)	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: dynamically register imx-i2c devices (imx1)	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: Change the way nand devices are registered (imx27)	Uwe Kleine-König
	Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: Change the way nand devices are registered (imx21)	Uwe Kleine-König
	Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2	Uwe Kleine-König
	This should be used instead of hard coding the corresponding platforms. The feature test macro is needed to support different SOCs in a single kernel image. While at it rename dma-mx1-mx2 to dma-v1 as mx25 doesn't use it and so the mx2 part is wrong and move the header to arch/arm/mach-imx. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: prepare deprecating ARCH_MX1, MACH_MX2, MACH_MX21 and MACH_MX27	Uwe Kleine-König
	MACH_... is reserved for machine support, so use SOC as prefix, not MACH. This introduces new symbols SOC_IMX1, SOC_IMX21 and SOC_IMX27. They are selected by the old symbols for now. There is no substitute for MACH_MX2 as most usages of MX2 only means MX21 + MX27 but not MX25. Later the choice about CPU and CPU family should go away and the individual machines should select the right SOC symbol. This is a precondition to support more than one SOC in a single kernel image. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: Kconfig: use an if block instead of a depend for many symbols	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30	ARM: imx: move mx1 support to mach-imx	Uwe Kleine-König
	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24	ARM: imx: rename mach dir for mx21 and mx27 to mach-imx	Uwe Kleine-König
	Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2009-05-07	[ARM] remove arch-imx	Sascha Hauer
	arch-imx is superseeded by the MXC architecture support. This patch removes arch/arm/mach-imx from the kernel. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2005-05-05	[PATCH] ARM: select PCI, ISA and ISA_DMA	Russell King
	Rather than using a long "depends on..." and "default y" lines for these options, use select instead. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
2005-04-16	Linux-2.6.12-rc2v2.6.12-rc2	Linus Torvalds
	Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in the meantime it's about 3.2GB when imported into git - space that would just make the early git days unnecessarily complicated, when we don't have a lot of good infrastructure for it. Let it rip!