linux/arch/sparc
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
..
boot Kbuild: centralize MKIMAGE and cmd_uimage definitions 2012-03-26 15:49:20 +02:00
configs
include/asm Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-04-04 17:13:43 -07:00
kernel sparc32,leon: add notify_cpu_starting() 2012-04-21 16:35:06 -04:00
lib lib: Fix multiple definitions of clz_tab 2012-02-02 10:34:23 +11:00
math-emu Disintegrate asm/system.h for Sparc 2012-03-28 18:30:03 +01:00
mm sparc/mm/fault_32.c: Port OOM changes to do_sparc_fault 2012-04-04 15:42:24 -07:00
net net: filter: remove unused cpu_off in sparc JIT 2012-04-17 22:55:59 -04:00
oprofile
prom Disintegrate asm/system.h for Sparc 2012-03-28 18:30:03 +01:00
Kconfig net: filter: Just In Time compiler for sparc 2012-04-16 23:15:14 -04:00
Kconfig.debug
Makefile net: filter: Just In Time compiler for sparc 2012-04-16 23:15:14 -04:00