kernel_optimize_test/drivers/infiniband
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
..
core net: Convert all sysctl registrations to register_net_sysctl 2012-04-20 21:22:30 -04:00
hw IB/mlx4: Don't return an invalid speed when a port is down 2012-04-02 10:55:24 -07:00
ulp IB/srpt: Set srq_type to IB_SRQT_BASIC 2012-04-12 07:56:57 -07:00
Kconfig ib_srpt: Initial SRP Target merge for v3.3-rc1 2011-12-16 06:33:56 +00:00
Makefile ib_srpt: Initial SRP Target merge for v3.3-rc1 2011-12-16 06:33:56 +00:00