Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

1 files changed, 2 insertions, 2 deletions

diff --git a/crypto/algapi.c b/crypto/algapi.c
index f149b1c8b76d..3e4524e6139b 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -230,7 +230,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
         list_add(&alg->cra_list, &crypto_alg_list);
         list_add(&larval->alg.cra_list, &crypto_alg_list);
 
-out:    
+out:
         return larval;
 
 free_larval:
@@ -388,7 +388,7 @@ int crypto_unregister_alg(struct crypto_alg *alg)
 {
         int ret;
         LIST_HEAD(list);
-        
+
         down_write(&crypto_alg_sem);
         ret = crypto_remove_alg(alg, &list);
         up_write(&crypto_alg_sem);