Arnd Bergmann wrote:
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.
Thanks :)
If any problems, please let me know.
One tiny conflict with Nico's cross-platform series:
Yes, I know. I have received same information from Stephen when he merged.
+
+ MACHINE_START(SMDKC210, SMDKC210)
+ /* Maintainer: Kukjin Kim kgene@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.
OK, thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html