diff --git a/[refs] b/[refs]
index 38bd2bc113da..8df555b4f4ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e61c3a57747150a583b2fb54bddb5dba09aa2cf
+refs/heads/master: 9d9a8811622e36611e8eeb2401e4e9805d4727f3
diff --git a/trunk/drivers/mtd/nand/nand_ids.c b/trunk/drivers/mtd/nand/nand_ids.c
index e04c675bf609..e3aa2748a6e7 100644
--- a/trunk/drivers/mtd/nand/nand_ids.c
+++ b/trunk/drivers/mtd/nand/nand_ids.c
@@ -174,7 +174,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
 	{NAND_MFR_STMICRO, "ST Micro"},
 	{NAND_MFR_HYNIX, "Hynix"},
 	{NAND_MFR_MICRON, "Micron"},
-	{NAND_MFR_AMD, "AMD"},
+	{NAND_MFR_AMD, "AMD/Spansion"},
 	{NAND_MFR_MACRONIX, "Macronix"},
 	{NAND_MFR_EON, "Eon"},
 	{0x0, "Unknown"}