diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-07-23 15:59:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-23 16:13:06 +0100 |
| commit | 5af84df962dd6699e3972fda7a0c8b579fb3ab04 (patch) | |
| tree | 0a66f54c99c0c0d22588304d030ecb752487dfa1 /net/bridge/br_private.h | |
| parent | Merge branch 'net-remove-compat-alloc-user-space' (diff) | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (diff) | |
| download | linux-dev-5af84df962dd6699e3972fda7a0c8b579fb3ab04.tar.xz linux-dev-5af84df962dd6699e3972fda7a0c8b579fb3ab04.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts are simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
0 files changed, 0 insertions, 0 deletions