Merge 3.11-rc3 into char-misc-next.

This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 8 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 25a5934f0e50..66d254ce0d11 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1174,10 +1174,6 @@ static int do_test(int m)
                 ret += tcrypt_test("ghash");
                 break;
 
-        case 47:
-                ret += tcrypt_test("crct10dif");
-                break;
-
         case 100:
                 ret += tcrypt_test("hmac(md5)");
                 break;
@@ -1502,10 +1498,6 @@ static int do_test(int m)
                 test_hash_speed("crc32c", sec, generic_hash_speed_template);
                 if (mode > 300 && mode < 400) break;
 
-        case 320:
-                test_hash_speed("crct10dif", sec, generic_hash_speed_template);
-                if (mode > 300 && mode < 400) break;
-
         case 399:
                 break;