| commit | cba653210056cf47cc1969f831f05ddfb99ee2bd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed May 04 00:52:29 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed May 04 00:52:29 2016 -0400 |
| tree | 92d93a3eee5b12d77af3696b9da8026e71df5752 | |
| parent | 26879da58711aa604a1b866cbeedd7e0f78f90ad [diff] | |
| parent | 7391daf2ffc780679d6ab3fad1db2619e5dd2c2a [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>