[GIT PULL] Samsung cleanup for v3.2
Arnd Bergmann
arnd at arndb.de
Tue Sep 20 16:22:41 EDT 2011
On Monday 19 September 2011, Kukjin Kim wrote:
> This is Samsung cleanup for v3.2.
>
> Please pull from:
> git://github.com/kgene/linux-samsung.git next-samsung-cleanup
Pulled into arm-soc/next/cleanup.
> If any problems, please let me know.
One tiny conflict with Nico's cross-platform series:
+
+ MACHINE_START(SMDKC210, "SMDKC210")
+ /* Maintainer: Kukjin Kim <kgene.kim at samsung.com> */
- .boot_params = S5P_PA_SDRAM + 0x100,
++ .atag_offset = 0x100,
+ .init_irq = exynos4_init_irq,
+ .map_io = smdkv310_map_io,
+ .init_machine = smdkv310_machine_init,
+ .timer = &exynos4_timer,
+ MACHINE_END
I'll handle this in the upstream submission.
Thanks,
Arnd
More information about the linux-arm-kernel
mailing list