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

Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/ax25/af_ax25.c
index 282eb76bc7d6bde4cab9c3146ed4712d49cb9c0c,9d9a6a3edbd58584fdceffdf680de6e28dc72c90..051f7abae66d987177536637c235865258cabbec
--- 1/net/ax25/af_ax25.c
--- 2/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@@ -2010,11 -2011,9 +2010,8 @@@ static void __exit ax25_exit(void
        proc_net_remove(&init_net, "ax25_route");
        proc_net_remove(&init_net, "ax25");
        proc_net_remove(&init_net, "ax25_calls");
-       ax25_rt_free();
-       ax25_uid_free();
-       ax25_dev_free();
  
        unregister_netdevice_notifier(&ax25_dev_notifier);
 -      ax25_unregister_sysctl();
  
        dev_remove_pack(&ax25_packet_type);
  

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/sched/sch_gred.c
Simple merge

diff --cc net/wireless/util.c
Simple merge