diff --git a/[refs] b/[refs]
index 4ddefb162e9c..43a174e02d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 085ffd08aa5bf61131641f84c8e8296176ecfd4b
+refs/heads/master: 35f168d10f64aafcee86c984efca8cb6537bfe26
diff --git a/trunk/drivers/staging/lirc/TODO.lirc_i2c b/trunk/drivers/staging/lirc/TODO.lirc_i2c
new file mode 100644
index 000000000000..1f0a6ff65439
--- /dev/null
+++ b/trunk/drivers/staging/lirc/TODO.lirc_i2c
@@ -0,0 +1,3 @@
+lirc_i2c provides support for some drivers that have already a RC
+driver under drivers/media/video. It should be integrated into those
+drivers, in special with drivers/media/video/ir-kbd-i2c.c.