diff --git a/[refs] b/[refs]
index 44a6af804f96..dcde733b6dd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02edb05e6310d3acbb26ffb038f0eb819274e6d0
+refs/heads/master: a712c0efbffb09f7b837577e29d0efb043fea0ea
diff --git a/trunk/drivers/block/aoe/aoe.h b/trunk/drivers/block/aoe/aoe.h
index bb7dd91e5d48..7ff5f9470f55 100644
--- a/trunk/drivers/block/aoe/aoe.h
+++ b/trunk/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "14"
+#define VERSION "21"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"