Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

2011-09-13 15:41:16 -04:00
parent 3857e3ee22 2fa8b6a0e4
commit b4d3de8ca2
100 changed files with 7763 additions and 6471 deletions
@@ -1792,6 +1792,7 @@ struct wiphy_wowlan_support {
 * @debugfsdir: debugfs directory used for this wiphy, will be renamed
 *	automatically on wiphy renames
 * @dev: (virtual) struct device for this wiphy
+ * @registered: helps synchronize suspend/resume with wiphy unregister
 * @wext: wireless extension handlers
 * @priv: driver private data (sized according to wiphy_new() parameter)
 * @interface_modes: bitmask of interfaces types valid for this wiphy,