diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-28 16:36:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 16:36:09 +0200 |
| commit | b35c809708ad245a36bef94d6fb1e83f6ab850aa (patch) | |
| tree | c6dc6580546c9a5997eae06c8409f986c383d2a4 /drivers/net/wireless/airo_cs.c | |
| parent | rt2800: fix wrong TX power compensation (diff) | |
| parent | ath9k: Enable PLL fix only for AR9340/AR9330 (diff) | |
| download | linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.xz linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/ibss.c
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
0 files changed, 0 insertions, 0 deletions