| commit | 6338a53a2bd02d5878ab449371323364b7cc7694 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Feb 18 23:32:49 2013 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Feb 18 23:34:21 2013 -0500 |
| tree | 461c4acae130771b9856715bc2cfdc341b6e5964 | |
| parent | 8064b3cf750e71fdaf306abb4433a93d0f45f4c9 [diff] | |
| parent | 18cf0d0784b4a634472ed24d0d7ca1c721d93e90 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net Pull in 'net' to take in the bug fixes that didn't make it into 3.8-final. Also, deal with the semantic conflict of the change made to net/ipv6/xfrm6_policy.c A missing rt6->n neighbour release was added to 'net', but in 'net-next' we no longer cache the neighbour entries in the ipv6 routes so that change is not appropriate there. Signed-off-by: David S. Miller <davem@davemloft.net>