diff --git a/[refs] b/[refs]
index 117ff087ec92..e1e5621515eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7d259d3a5e5975b8d0b67759f2632fbd0d508d2
+refs/heads/master: fd235913f9d86fde954f7e1215bd0921ee70cb19
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 09024ab617f9..95980317d983 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -1810,6 +1810,8 @@ struct wiphy_wowlan_support {
  *	by default for perm_addr. In this case, the mask should be set to
  *	all-zeroes. In this case it is assumed that the device can handle
  *	the same number of arbitrary MAC addresses.
+ * @registered: protects ->resume and ->suspend sysfs callbacks against
+ *	unregister hardware
  * @debugfsdir: debugfs directory used for this wiphy, will be renamed
  *	automatically on wiphy renames
  * @dev: (virtual) struct device for this wiphy