On Tue, May 08, 2012 at 05:21:53PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/char/hw_random/Kconfig between commit 028fdd87b79a ("hwrng: > Kconfig - modify default state for atmel-rng driver") from the crypto > tree and commit 1234f4bada54 ("hwrng: Kconfig: remove dependency for > atmel-rng driver") from the arm-soc tree. > > Juts context changes. I fixed it up (see below) and can carry the fix as > necessary. Looks good. Thanks Stephen! -- 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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html