iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
272,817 Commits 104 Branches 1,843 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Arnd Bergmann
a7fadac10f Merge branch 'depends/rmk/devel-stable' into next/board 
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>
 2011-11-01 00:11:41 +01:00
Richard Cochran
2b8f0119b8 ixp4xx: support omicron ixp425 based boards 
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>
 2011-09-30 22:18:42 +02:00