| commit | 3549c6b1953c3e951e71fbec94f9ed203c4754e7 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Feb 08 14:23:51 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Feb 08 14:39:54 2013 -0500 |
| tree | fb820b173e94f10f1e1fe39ed00e55505057d73f | |
| parent | b26f5f09ebdeb85ab152344cc1d6d484a3ce967d [diff] | |
| parent | 3f52b7e328c526fa7a592af9bf5772c591ed38a4 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Fixed-up drivers/net/wireless/iwlwifi/mvm/mac80211.c to change change IEEE80211_HW_NEED_DTIM_PERIOD to IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC as requested by Johannes Berg. -- JWL Signed-off-by: John W. Linville <linville@tuxdriver.com>