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

arch/arm/mach-omap2/board-apollon.c

@@ -339,7 +339,7 @@ static void __init omap_apollon_init(void)
 
 MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
 	/* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
-	.boot_params	= 0x80000100,
+	.atag_offset	= 0x100,
 	.reserve	= omap_reserve,
 	.map_io		= omap242x_map_io,
 	.init_early	= omap2420_init_early,