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

@@ -486,7 +486,7 @@ static void __init am3517_evm_init(void)
}
MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
.boot_params = 0x80000100,
.atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = am35xx_init_early,