MAINTAINERS · 7a55724e0dc24cadaeb58f8306222a7802a24ff1 · jan.koester / Linux · GitLab

Sep 24, 2010
29ad2fac
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 · 29ad2fac
John W. Linville authored Sep 24, 2010
```
Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c
```
29ad2fac
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
John W. Linville authored Sep 24, 2010
```
Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c
```