linux-next: manual merge of the arm-soc tree with the arm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-versatile/localtimer.c between commit e9f07fbc5f5b ("ARM:
plat-versatile: convert to twd_local_timer_register() interface") from
the arm tree and commit e129440af638 ("ARM: versatile: Map local timers
using Device Tree when possible") from the arm-soc tree.

I did the obvious thing and removed the file (as the former does), but
there is probably more to be fixed up.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120313/6a619335/attachment.sig>