diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-19 22:41:22 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-19 22:41:22 +0400 |
| commit | b3c911eeb47d08aada986f769b6a060794dfe9d0 (patch) | |
| tree | 212209c15a26006a62da9252efe18f27f16a0a4a /include/linux/if_team.h | |
| parent | 43b03f1f6d6832d744918947d185a7aee89d1e0f (diff) | |
| parent | daf67ce8cffd148308ae15c25fb06c1fc20c88f1 (diff) | |
| download | linux-b3c911eeb47d08aada986f769b6a060794dfe9d0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/dvm/testmode.c
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'include/linux/if_team.h')
0 files changed, 0 insertions, 0 deletions