diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-31 23:52:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-31 23:52:20 -0700 |
| commit | 5510b3c2a173921374ec847848fb20b98e1c698a (patch) | |
| tree | c9e185281ef17280ce0dc30be7923124874736b0 /net/core/rtnetlink.c | |
| parent | 17f901e8915cb922c2ca710835ef34f166f53ee9 (diff) | |
| parent | 7c764cec3703583247c4ab837c652975a3d41f4b (diff) | |
| download | blackbird-op-linux-5510b3c2a173921374ec847848fb20b98e1c698a.tar.gz blackbird-op-linux-5510b3c2a173921374ec847848fb20b98e1c698a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/s390/net/bpf_jit_comp.c
drivers/net/ethernet/ti/netcp_ethss.c
net/bridge/br_multicast.c
net/ipv4/ip_fragment.c
All four conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/rtnetlink.c')
0 files changed, 0 insertions, 0 deletions
