linux-next: manual merge of the crypto tree with the arm-soc tree
From: Stephen Rothwell <hidden>
Date: 2014-02-26 04:02:09
Also in:
linux-arm-kernel, lkml
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
switch Kconfig to ARCH_QCOM depends") from the arm-soc tree and commit
f9bee046c915 ("hwrng: msm: switch Kconfig to ARCH_QCOM depends") from the
crypto tree.
Two version of the same patch ... I just kept the arm-soc version.
--
Cheers,
Stephen Rothwell [off-list ref] Attachments
- (unnamed) [application/pgp-signature] 836 bytes