diff --git a/[refs] b/[refs]
index 62decd233682..3abadc0319f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3f54f319a6145241c37663f0e21b10888ee0920
+refs/heads/master: 8906d770d8314cf9ab5289ee971594cb250f541d
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 639b5d7c9603..6a4126f7ecf1 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -6949,11 +6949,6 @@ wlc_recvctl(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p)
 #if defined(BCMDBG)
 	struct sk_buff *skb = p;
 #endif				/* BCMDBG */
-	/* Todo:
-	 * Cache plcp for first MPDU of AMPD and use chacched version for INTERMEDIATE.
-	 * Test for INTERMEDIATE  like so:
-	 * if (!(plcp[0] | plcp[1] | plcp[2]))
-	 */
 
 	memset(&rx_status, 0, sizeof(rx_status));
 	prep_mac80211_status(wlc, rxh, p, &rx_status);