]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3008331 8346ed7)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:23:51 +0000 (14:23 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:39:54 +0000 (14:39 -0500)
commite015663774caad751657dd0a5d2ed1dffa9ba287
treefb820b173e94f10f1e1fe39ed00e55505057d73ftree | snapshot
parent3008331d0ce073449e5544fe3ca7e6a53a83f519commit | diff
parent8346ed71e37e549332c8eef5a1765c437f8461facommit | 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>
drivers/net/wireless/iwlegacy/4965-mac.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/dvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c diff1 | | blob | history
Linux Kernel Source Tree.