[PULL] Pull request for for-rmk/samsung5
Russell King - ARM Linux
linux at arm.linux.org.uk
Thu Feb 25 15:53:01 EST 2010
On Thu, Feb 25, 2010 at 12:09:19AM +0000, Ben Dooks wrote:
> Sorry for the late request, but haven't been very well. Quite a bit of
> this update has been on list for a while, but only just been merged
> together into one tree.
>
> This is the last of the Samsung updates that need to go via RMK, they
> are mostly plat-s3c/plat-s3c64xx and machine squashed and the new
> S5P6442 and S5PV210 code.
>
> Included are some updates for the current code to avoid build or runtime
> problems with other updates such as via the ASoC tree.
>
> I will be doing a seperate set of updates direct to Linus once these are
> merged to fix and outstanding problems, any updates such as S3C2443 clock
> rewrite and anything else not directly relying on arch/arm modifications.
>
> There will also be a set of documentation updates to deal with the current
> shifts and outline anything else that needs to be done.
>
> Anything urgent, please cc: me directly.
>
> The following changes since commit ab5d97db1c6ced3e95c00d097931471707032b1f:
> Ben Dooks (1):
> ARM: SAMSUNG: Fix bad use of __initdata for s3c_register_clocks()
>
> are available in the git repository at:
>
> git://git.fluff.org/bjdooks/linux.git for-rmk/samsung5
This gives me conflicts in arch/arm/Makefile and arch/arm/Kconfig. I'll
need to investigate, which I'll do over the weekend.
More information about the linux-arm-kernel
mailing list