From: David S. Miller <davem@davemloft.net>
Date: Tue, 24 Apr 2012 03:14:36 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f24001941c99776f41bd3f09c07d91205c2ad9d4;p=deliverable%2Flinux.git

Merge git://git./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>
---

f24001941c99776f41bd3f09c07d91205c2ad9d4
diff --cc net/ax25/af_ax25.c
index 282eb76bc7d6,9d9a6a3edbd5..051f7abae66d
--- a/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);