diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 20:51:28 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 20:51:28 +0100 |
| commit | 87bc0728d462ae37841a550542829aa65a97e7c2 (patch) | |
| tree | 266afb90f501b814c0a79f10a7afd86a6a33d631 /net/wireless/Kconfig | |
| parent | net/hsr: Add support for the High-availability Seamless Redundancy protocol (... (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-87bc0728d462ae37841a550542829aa65a97e7c2.tar.xz linux-87bc0728d462ae37841a550542829aa65a97e7c2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
Diffstat (limited to 'net/wireless/Kconfig')
0 files changed, 0 insertions, 0 deletions