Merge branch 'depends/rmk/devel-stable' into next/cleanup

This commit is contained in:
Arnd Bergmann
2011-10-08 21:07:42 +02:00
405 changed files with 7180 additions and 1560 deletions

View File

@@ -366,7 +366,7 @@ static void __init omap_h4_init(void)
MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
.boot_params = 0x80000100,
.atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap242x_map_io,
.init_early = omap2420_init_early,