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

Conflicts:
	net/ipv6/route.c

Pull in 'net' again to get the revert of Thomas's change
which introduced regressions.

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

1 files changed, 0 insertions, 2 deletions

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 7fdbad522543..a192f7807659 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -302,8 +302,6 @@ extern void			fib6_run_gc(unsigned long expires,
 extern void                     fib6_gc_cleanup(void);
 
 extern int                      fib6_init(void);
-extern int                      fib6_init_late(void);
-extern void                     fib6_cleanup_late(void);
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
 extern int                      fib6_rules_init(void);