Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

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

...

This commit is contained in:

David S. Miller 2016-05-04 00:52:29 -04:00

parent 26879da587 7391daf2ff

commit cba6532100

263 changed files with 2446 additions and 1230 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

4

lib/stackdepot.c

View file