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>

1 files changed, 1 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5abc10efffa2..8bbd949f8c2e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7524,7 +7524,7 @@ S:	Maintained
 F:      drivers/media/tuners/tea5767.*
 
 TEAM DRIVER
-M:      Jiri Pirko <jpirko@redhat.com>
+M:      Jiri Pirko <jiri@resnulli.us>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/team/