David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("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>

2012-04-23 23:15:17 -04:00

..

af_ax25.c

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

2012-04-23 23:15:17 -04:00

ax25_addr.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_dev.c

net ax25: Simplify and cleanup the ax25 sysctl handling.

2012-04-20 21:22:28 -04:00

ax25_ds_in.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_ds_subr.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_ds_timer.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_iface.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_in.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_ip.c

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

ax25_out.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_route.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_std_in.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_std_subr.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_std_timer.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_subr.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_timer.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25_uid.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

Kconfig

…

Makefile

…

sysctl_net_ax25.c

net ax25: Simplify and cleanup the ax25 sysctl handling.

2012-04-20 21:22:28 -04:00

TODO

…