diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-19 20:41:22 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-19 20:41:22 +0200 |
| commit | b3c911eeb47d08aada986f769b6a060794dfe9d0 (patch) | |
| tree | 212209c15a26006a62da9252efe18f27f16a0a4a /drivers/net/tun.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | iwlwifi: unlock on error path (diff) | |
| download | linux-b3c911eeb47d08aada986f769b6a060794dfe9d0.tar.xz linux-b3c911eeb47d08aada986f769b6a060794dfe9d0.zip | |
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 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions