diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-10-08 23:07:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-08 23:07:53 -0400 |
| commit | 53af53ae83fe960ceb9ef74cac7915e9088f4266 (patch) | |
| tree | 0cd5309f2a931d3f210aa3d2025aae64f2276e8c /net/dccp | |
| parent | Revert "veth: Showing peer of veth type dev in ip link (kernel side)" (diff) | |
| parent | Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (diff) | |
| download | linux-dev-53af53ae83fe960ceb9ef74cac7915e9088f4266.tar.xz linux-dev-53af53ae83fe960ceb9ef74cac7915e9088f4266.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/linux/netdevice.h
net/core/sock.c
Trivial merge issues.
Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.
Two parallel line additions in net/core/sock.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
0 files changed, 0 insertions, 0 deletions