diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-08 02:34:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-08 02:34:04 +0100 |
| commit | 5ba907a949562cd4839b0170a13dda6841055e70 (patch) | |
| tree | 32d7ab834753779d3e1216a3a251c8c2fb097438 /drivers/net/macvtap.c | |
| parent | staging: wilc1000: fix build failure (diff) | |
| parent | Linux 4.5-rc3 (diff) | |
| download | linux-5ba907a949562cd4839b0170a13dda6841055e70.tar.xz linux-5ba907a949562cd4839b0170a13dda6841055e70.zip | |
Merge 4.5-rc3 into staging-next
We want the upstream staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/macvtap.c')
0 files changed, 0 insertions, 0 deletions