Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Tue, 24 Apr 2012 03:14:36 +0000 (23:14 -0400)]
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>

15 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/smsc/smsc911x.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/wireless/ath/ath9k/main.c
include/net/sock.h
net/ax25/af_ax25.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/ipv6/tcp_ipv6.c
net/mac80211/ibss.c
net/mac80211/rx.c
net/sched/sch_gred.c
net/wireless/util.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge