tree 0ab31480ccdf343b61db045e195d096068ef7c73
parent a108d5f35adc5c5d5cdc882dc0bb920565551bff
parent 4d634ca35a8b38530b134ae92bc9e3cc9c23c030
author David S. Miller <davem@davemloft.net> 1335237276 -0400
committer David S. Miller <davem@davemloft.net> 1335237317 -0400

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>