[GIT PULL] omap board updates for v3.1 merge window

Arnd Bergmann arnd at arndb.de
Thu Jul 7 16:40:58 EDT 2011


On Thursday 07 July 2011 18:29:11 Tony Lindgren wrote:
> Please pull omap board updates from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board
> 
> These are currently on top of the fixes you pulled earlier but
> could be also rebased on the earlier cleanup if you prefer that.

I would generally prefer them to be independent, even if that causes
minor conflicts. If some branches are built on top of others, that
mainly means I have to remember the order in which to send them
upstream, and my memory for these things is limited.
 
> Please note that the board-cm-t35.c change will need a minor fix
> when merging with the atag_offset patch series. In MACHINE_START
> the .boot_params needs to be replaced with .atag_offset = 0x100.
>
> Also note that this series is missing the Nook Color board
> support as that one is waiting on the machine_id patch.

Ok

Thanks,

	Arnd



More information about the linux-arm-kernel mailing list