]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Apr 2013 18:09:39 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Apr 2013 18:09:39 +0000 (14:09 -0400)
commitc0cdb3f00c6e37b39b0a142728ecb0d09c718891
tree5a41c0f766143e462bfde8515ca6547d4ee7f78e
parentb0092f2cb0ce808d21d19a31685e6883673bb59f
parentb88129893a0aafaf280365e1540fe8f48fd059dc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/ssb/driver_chipcommon_pmu.c
net/mac80211/iface.c
net/mac80211/mlme.c