Al Viro 85910c202b Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc ...

Backmerge from the point in mainline where a trivial conflict had been
introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features()
right after where kernel_execve() used to be)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2012-11-16 20:49:06 -05:00

..

boot

sparc32: drop build time btfixup patching

2012-05-14 14:05:10 -07:00

configs

perf: Remove PERF_COUNTERS config option

2012-04-26 13:52:52 +02:00

crypto

sparc64: Fix function argument comment in camellia_sparc64_key_expand asm.

2012-09-21 12:04:51 -07:00

include

Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc

2012-11-16 20:49:06 -05:00

kernel

Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc

2012-11-16 20:49:06 -05:00

lib

sparc64: Niagara-4 bzero/memset, plus use MRU stores in page copy.

2012-10-05 13:45:26 -07:00

math-emu

sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.

2012-10-26 15:18:37 -07:00

mm

Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc

2012-11-16 20:49:06 -05:00

net

sparc: bpf_jit_comp: add XOR instruction for BPF JIT JIT

2012-09-27 18:04:35 -04:00

oprofile

sparc: using HZ needs an include of linux/param.h

2009-10-05 00:46:08 -07:00

prom

sparc32: Remove superfluous extern declarations for prom_*() functions

2012-06-27 01:27:45 -07:00

Kbuild

sparc64: Add SHA1 driver making use of the 'sha1' instruction.

2012-08-20 15:08:49 -07:00

Kconfig

sparc32: switch to generic kernel_execve()

2012-10-16 19:03:53 -04:00

Kconfig.debug

lib: consolidate DEBUG_STACK_USAGE option

2011-05-25 08:39:54 -07:00

Makefile

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-21 19:43:57 -07:00