Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

On Mon, May 07, 2012 at 12:11:37PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got conflicts in
> arch/arm/mach-ux500/board-mop500.c and arch/arm/mach-ux500/board-u5500.c
> between commit b024a0c80435 ("ARM: ux500: move top level platform devices
> in sysfs to /sys/devices/socX") from Linus' tree and commit 3ba812f4d0be
> ("mach-ux500: crypto - core support for CRYP/HASH module") from the
> crypto tree.
> 
> Just context changes.  I fixed them up (see below) and can carry the
> fixes as necessary.

I think it looks fine but I'll let Linus Walleij have the final
say on this.

Thanks!
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/