diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-07 07:10:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-07 07:10:13 +0200 |
| commit | 3793faad7b5b730941b2efbc252d14374b60843a (patch) | |
| tree | e1bea43727d87f8fd30ca169f465a3591f15d63b /drivers/platform/x86/intel-vbtn.c | |
| parent | dsa: sja1105: dynamically allocate stats structure (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-3793faad7b5b730941b2efbc252d14374b60843a.tar.xz linux-3793faad7b5b730941b2efbc252d14374b60843a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts were all overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/platform/x86/intel-vbtn.c')
0 files changed, 0 insertions, 0 deletions