diff --git a/[refs] b/[refs]
index 26f5e40d2413..5689d9458f27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 068f4070868c801c7d7aa1ae1193c1c854193545
+refs/heads/master: 3f86f14c0fc9fdb0984e64209df2f47895a07151
diff --git a/trunk/drivers/spi/at25.c b/trunk/drivers/spi/at25.c
index e007833cca59..290dbe99647a 100644
--- a/trunk/drivers/spi/at25.c
+++ b/trunk/drivers/spi/at25.c
@@ -21,6 +21,13 @@
 #include <linux/spi/eeprom.h>
 
 
+/*
+ * NOTE: this is an *EEPROM* driver.  The vagaries of product naming
+ * mean that some AT25 products are EEPROMs, and others are FLASH.
+ * Handle FLASH chips with the drivers/mtd/devices/m25p80.c driver,
+ * not this one!
+ */
+
 struct at25_data {
 	struct spi_device	*spi;
 	struct mutex		lock;