Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  Revert "hwrng: n2-drv - remove casts from void*"
  crypto: testmgr - Default to no tests
  crypto: testmgr - Fix test disabling option
  crypto: hash - Fix handling of small unaligned buffers

diff --combined drivers/char/hw_random/n2-drv.c
index 1acdb25,d8a4ca8..a3f5e38
--- 1/drivers/char/hw_random/n2-drv.c
--- 2/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@@ -387,7 -387,7 +387,7 @@@ static int n2rng_init_control(struct n2
  
  static int n2rng_data_read(struct hwrng *rng, u32 *data)
  {
-       struct n2rng *np = rng->priv;
+       struct n2rng *np = (struct n2rng *) rng->priv;
        unsigned long ra = __pa(&np->test_data);
        int len;
  
@@@ -619,7 -619,7 +619,7 @@@ static void __devinit n2rng_driver_vers
                pr_info("%s", version);
  }
  
 -static int __devinit n2rng_probe(struct of_device *op,
 +static int __devinit n2rng_probe(struct platform_device *op,
                                 const struct of_device_id *match)
  {
        int victoria_falls = (match->data != NULL);
@@@ -714,7 -714,7 +714,7 @@@ out
        return err;
  }
  
 -static int __devexit n2rng_remove(struct of_device *op)
 +static int __devexit n2rng_remove(struct platform_device *op)
  {
        struct n2rng *np = dev_get_drvdata(&op->dev);