diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-30 17:35:32 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-30 17:35:32 -0700 |
commit | e9bcbc970a774bc8e17fd7eb24b9969be67d666e (patch) | |
tree | af8d8ad62a6b81cc570cdfed83496872e670e909 /net/ipv4/ipmr.c | |
parent | 078252e0e877b50fcd42d3bd0d112f1f7c8518e8 (diff) | |
parent | a68be015aece7b9f33f1523048e445b72ca7111d (diff) | |
download | talos-obmc-linux-e9bcbc970a774bc8e17fd7eb24b9969be67d666e.tar.gz talos-obmc-linux-e9bcbc970a774bc8e17fd7eb24b9969be67d666e.zip |
Merge branch 's390-next'
Frank Blaschka says:
====================
s390: network patches for net-next V1
here are some s390 related patches for net-next
Added some style fixing reported by David Laight.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
0 files changed, 0 insertions, 0 deletions