| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Jun 03 23:32:12 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Jun 03 23:32:12 2014 -0700 |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a | |
| parent | 92ff71b8fe9cd9c673615fc6f3870af7376d7c84 [diff] | |
| parent | d8b0426af5b67973585712c9af36b86f6ea97815 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>