diff options
| author | David S. Miller <[email protected]> | 2017-12-10 03:09:55 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-12-10 03:09:55 +0000 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /net/tipc/socket.c | |
| parent | macvlan: fix memory hole in macvlan_dev (diff) | |
| parent | kmemcheck: rip it out for real (diff) | |
| download | kernel-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.gz kernel-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/tipc/socket.c')
0 files changed, 0 insertions, 0 deletions