diff --git a/[refs] b/[refs]
index 47e870f61bd1..489030425925 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d
+refs/heads/master: 70ef2601feb09d40f4086d055700b7923b3c2d6f
diff --git a/trunk/arch/x86/crypto/aes_glue.c b/trunk/arch/x86/crypto/aes_glue.c
index 8efcf42a9d7e..59b37deb8c8d 100644
--- a/trunk/arch/x86/crypto/aes_glue.c
+++ b/trunk/arch/x86/crypto/aes_glue.c
@@ -5,7 +5,7 @@
 
 #include <linux/module.h>
 #include <crypto/aes.h>
-#include <asm/aes.h>
+#include <asm/crypto/aes.h>
 
 asmlinkage void aes_enc_blk(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);
 asmlinkage void aes_dec_blk(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);
diff --git a/trunk/arch/x86/crypto/aesni-intel_glue.c b/trunk/arch/x86/crypto/aesni-intel_glue.c
index 7c9d54d8dc4d..d6626152067d 100644
--- a/trunk/arch/x86/crypto/aesni-intel_glue.c
+++ b/trunk/arch/x86/crypto/aesni-intel_glue.c
@@ -30,7 +30,7 @@
 #include <crypto/ctr.h>
 #include <asm/cpu_device_id.h>
 #include <asm/i387.h>
-#include <asm/aes.h>
+#include <asm/crypto/aes.h>
 #include <asm/crypto/ablk_helper.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/internal/aead.h>
diff --git a/trunk/arch/x86/include/asm/aes.h b/trunk/arch/x86/include/asm/crypto/aes.h
similarity index 100%
rename from trunk/arch/x86/include/asm/aes.h
rename to trunk/arch/x86/include/asm/crypto/aes.h