diff --git a/[refs] b/[refs]
index c06c5577d78e..cc2181564936 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11c9a55d08d3d79c7a690312966567f70758886a
+refs/heads/master: 0fe212f7e3347c7d146258c9bc893bfd118df71e
diff --git a/trunk/drivers/staging/winbond/TODO b/trunk/drivers/staging/winbond/TODO
index 43bee56a7df6..b4c592a96844 100644
--- a/trunk/drivers/staging/winbond/TODO
+++ b/trunk/drivers/staging/winbond/TODO
@@ -6,6 +6,7 @@ TODO:
 	- remove unused ioctls
 	- use cfg80211 for regulatory stuff
 	- fix 4k stack problems
+	- fix locking problems (it's done using atomics...)
 
 Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
 Pavel Machek <pavel@ucw.cz>