diff --git a/[refs] b/[refs]
index c4719a09011f..e7077c9589ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 793d7b7ffe7e9d35e8c841b9115ee60a362b078e
+refs/heads/master: b20cc073c2e6a206ebe6449a9c1f1db98376981b
diff --git a/trunk/drivers/staging/media/go7007/s2250-board.c b/trunk/drivers/staging/media/go7007/s2250-board.c
index cb364273ae8f..beaa98b9c85a 100644
--- a/trunk/drivers/staging/media/go7007/s2250-board.c
+++ b/trunk/drivers/staging/media/go7007/s2250-board.c
@@ -29,6 +29,13 @@
 MODULE_DESCRIPTION("Sensoray 2250/2251 i2c v4l2 subdev driver");
 MODULE_LICENSE("GPL v2");
 
+/*
+ * Note: this board has two i2c devices: a vpx3226f and a tlv320aic23b.
+ * Due to the unusual way these are accessed on this device we do not
+ * reuse the i2c drivers, but instead they are implemented in this
+ * driver. It would be nice to improve on this, though.
+ */
+
 #define TLV320_ADDRESS      0x34
 #define VPX322_ADDR_ANALOGCONTROL1	0x02
 #define VPX322_ADDR_BRIGHTNESS0		0x0127