Merge branch 'ip_tunnel'

Browse source

ip_tunnel bug fixes from Steffen Klassert.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2013-10-01 12:42:28 -04:00

parent e024bdc051 cfe4a53692

commit 9cb1712468

2 changed files with 10 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

net/ipv4/ip_tunnel.c

View file

2

net/ipv4/ip_tunnel_core.c

View file