diff --git a/[refs] b/[refs]
index 23cd3f2c3ab7..18c0a13febd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61ee6bd487b9cc160e533034eb338f2085dc7922
+refs/heads/master: 5c2e2e239ebe44e3fdc5f2ae270d96c4ceee4e9a
diff --git a/trunk/net/ax25/TODO b/trunk/net/ax25/TODO
index 4089c49e45cc..69fb4e368d92 100644
--- a/trunk/net/ax25/TODO
+++ b/trunk/net/ax25/TODO
@@ -9,10 +9,6 @@ being used.
 Routes to a device being taken down might be deleted by ax25_rt_device_down
 but added by somebody else before the device has been deleted fully.
 
-Massive amounts of lock_kernel / unlock_kernel are just a temporary solution to
-get around the removal of SOCKOPS_WRAP.  A serious locking strategy has to be
-implemented.
-
 The ax25_rt_find_route synopsys is pervert but I somehow had to deal with
 the race caused by the static variable in it's previous implementation.