diff --git a/[refs] b/[refs]
index 60a18edce7eb..be2bea468acb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a3688b6af103e2c86a7cfc2050988655e184ecc
+refs/heads/master: 36560d255b017dbcaefbf0f8fee7ad4dd1f0fe0a
diff --git a/trunk/drivers/mtd/cmdlinepart.c b/trunk/drivers/mtd/cmdlinepart.c
index 68782ab2f0de..71bc07f149b7 100644
--- a/trunk/drivers/mtd/cmdlinepart.c
+++ b/trunk/drivers/mtd/cmdlinepart.c
@@ -306,7 +306,7 @@ static int parse_cmdline_partitions(struct mtd_info *master,
 	unsigned long offset;
 	int i;
 	struct cmdline_mtd_partition *part;
-	char *mtd_id = master->name;
+	const char *mtd_id = master->name;
 
 	/* parse command line */
 	if (!cmdline_parsed)