Merge remote-tracking branch 'crypto/master'

diff --cc drivers/char/hw_random/omap-rng.c
index d2903e7722704843ac254390046b65b5b5540d6c,e5deb99feb28f24ec9dffb62f404cdc2a53f1c9e..6843ec87b98b9f87b3a6ebc3736335d6884826ff
--- 1/drivers/char/hw_random/omap-rng.c
--- 2/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@@ -116,9 -116,14 +116,9 @@@ static int omap_rng_probe(struct platfo
        };
  
        omap_rng_ops.priv = (unsigned long)priv;
-       dev_set_drvdata(&pdev->dev, priv);
+       platform_set_drvdata(pdev, priv);
  
        priv->mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      if (!priv->mem_res) {
 -              ret = -ENOENT;
 -              goto err_ioremap;
 -      }
 -
        priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
        if (IS_ERR(priv->base)) {
                ret = PTR_ERR(priv->base);

diff --cc lib/Kconfig
Simple merge