diff --git a/[refs] b/[refs]
index 45105bd257a7..880e4a6d409c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3acd638a2b8b9c3cd1b52b83e285c88d34ef7f3
+refs/heads/master: b2d4fbab79bd2b121c56db757c3a0f06ec7e0868
diff --git a/trunk/drivers/mtd/nand/fsl_upm.c b/trunk/drivers/mtd/nand/fsl_upm.c
index ab06a5b514a9..d721ec055cbf 100644
--- a/trunk/drivers/mtd/nand/fsl_upm.c
+++ b/trunk/drivers/mtd/nand/fsl_upm.c
@@ -349,7 +349,7 @@ static int __devexit fun_remove(struct of_device *ofdev)
 	return 0;
 }
 
-static struct of_device_id of_fun_match[] = {
+static const struct of_device_id of_fun_match[] = {
 	{ .compatible = "fsl,upm-nand" },
 	{},
 };
diff --git a/trunk/drivers/mtd/nand/pasemi_nand.c b/trunk/drivers/mtd/nand/pasemi_nand.c
index a8b9376cf324..090a05c12cbe 100644
--- a/trunk/drivers/mtd/nand/pasemi_nand.c
+++ b/trunk/drivers/mtd/nand/pasemi_nand.c
@@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove(struct of_device *ofdev)
 	return 0;
 }
 
-static struct of_device_id pasemi_nand_match[] =
+static const struct of_device_id pasemi_nand_match[] =
 {
 	{
 		.compatible   = "pasemi,localbus-nand",
diff --git a/trunk/drivers/mtd/nand/socrates_nand.c b/trunk/drivers/mtd/nand/socrates_nand.c
index a4519a7bd683..65748ea2b348 100644
--- a/trunk/drivers/mtd/nand/socrates_nand.c
+++ b/trunk/drivers/mtd/nand/socrates_nand.c
@@ -290,7 +290,7 @@ static int __devexit socrates_nand_remove(struct of_device *ofdev)
 	return 0;
 }
 
-static struct of_device_id socrates_nand_match[] =
+static const struct of_device_id socrates_nand_match[] =
 {
 	{
 		.compatible   = "abb,socrates-nand",