diff --git a/[refs] b/[refs]
index 578a2c39a59e..289d00711587 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37d2e1f3dfbac5cdb93f9990840b24350b3d9403
+refs/heads/master: 05e6468db5e5cb733b096a9ccd244fe2e148ac14
diff --git a/trunk/drivers/staging/brcm80211/TODO b/trunk/drivers/staging/brcm80211/TODO
index e2e2ef9bd7ac..7f68762b1c3f 100644
--- a/trunk/drivers/staging/brcm80211/TODO
+++ b/trunk/drivers/staging/brcm80211/TODO
@@ -4,10 +4,6 @@ Bugs
 ====
 - none known at this moment
 
-brcmfmac
-=====================
-- ASSERTS deprecated in mainline, replace by warning + error handling
-
 brcm80211 info page
 =====================
 http://linuxwireless.org/en/users/Drivers/brcm80211