Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'depends/rmk/devel-stable' into next/board | Arnd Bergmann | 2011-11-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | The exynos4 updates conflict with code from the arm devel-stable branch and new boards need to set atag_offset in place of boot_param. Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/include/mach/entry-macro.S arch/arm/mach-exynos4/mach-smdkc210.c arch/arm/mach-exynos4/mach-smdkv310.c arch/arm/mach-exynos4/mct.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> | ||||
* | ixp4xx: support omicron ixp425 based boards | Richard Cochran | 2011-09-30 | 1 | -0/+273 |
This patch adds board support for the DEVIXP, the MICCPT, and the MIC256, which are three IXP425 based boards produced by OMICRON electronics, GmbH. Signed-off-by: Richard Cochran <richard.cochran@omicron.at> Signed-off-by: Arnd Bergmann <arnd@arndb.de> |