diff --git a/[refs] b/[refs]
index 295cd10d4b0c..59072e992381 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4739ea63c56928103bc1748c6d9b1df5d815a02
+refs/heads/master: 21a6a6e9f81fb26fbcecbb1304018d34dcd1794f
diff --git a/trunk/drivers/staging/heci/TODO b/trunk/drivers/staging/heci/TODO
new file mode 100644
index 000000000000..f86715d631c4
--- /dev/null
+++ b/trunk/drivers/staging/heci/TODO
@@ -0,0 +1,6 @@
+TODO:
+	- fix user/kernel pointer mess in the ioctl handlers as pointed
+	  out by sparse.
+	- resolve the ioctls and see if most of them can just be simple
+	  sysfs files
+	- fix locking issues that sparse points out at the least.