Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge mainline to add prerequisite for ARM ux500 crypto support.

diff --combined drivers/char/hw_random/omap-rng.c
index 448ddb59438a0d06719c686f0eb4aca471337257,a07a5caa599cde1f0acf41c6dc4bbd32c9d92f36..1412565c01afb213407fea17469ce0037f301610
--- 1/drivers/char/hw_random/omap-rng.c
--- 2/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@@ -26,6 -26,8 +26,8 @@@
  
  #include <asm/io.h>
  
+ #include <plat/cpu.h>
+ 
  #define RNG_OUT_REG           0x00            /* Output register */
  #define RNG_STAT_REG          0x04            /* Status register
                                                        [0] = STAT_BUSY */
@@@ -113,12 -115,22 +115,12 @@@ static int __devinit omap_rng_probe(str
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  
 -      if (!res) {
 -              ret = -ENOENT;
 -              goto err_region;
 -      }
 -
 -      if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
 -              ret = -EBUSY;
 -              goto err_region;
 -      }
 -
 -      dev_set_drvdata(&pdev->dev, res);
 -      rng_base = ioremap(res->start, resource_size(res));
 +      rng_base = devm_request_and_ioremap(&pdev->dev, res);
        if (!rng_base) {
                ret = -ENOMEM;
                goto err_ioremap;
        }
 +      dev_set_drvdata(&pdev->dev, res);
  
        ret = hwrng_register(&omap_rng_ops);
        if (ret)
@@@ -133,8 -145,11 +135,8 @@@
        return 0;
  
  err_register:
 -      iounmap(rng_base);
        rng_base = NULL;
  err_ioremap:
 -      release_mem_region(res->start, resource_size(res));
 -err_region:
        if (cpu_is_omap24xx()) {
                clk_disable(rng_ick);
                clk_put(rng_ick);
@@@ -144,15 -159,20 +146,15 @@@
  
  static int __exit omap_rng_remove(struct platform_device *pdev)
  {
 -      struct resource *res = dev_get_drvdata(&pdev->dev);
 -
        hwrng_unregister(&omap_rng_ops);
  
        omap_rng_write_reg(RNG_MASK_REG, 0x0);
  
 -      iounmap(rng_base);
 -
        if (cpu_is_omap24xx()) {
                clk_disable(rng_ick);
                clk_put(rng_ick);
        }
  
 -      release_mem_region(res->start, resource_size(res));
        rng_base = NULL;
  
        return 0;