H. Peter Anvin de65d816aa Merge remote-tracking branch 'origin/x86/boot' into x86/mm2 ... Coming patches to x86/mm2 require the changes and advanced baseline in x86/boot. Resolved Conflicts: arch/x86/kernel/setup.c mm/nobootmem.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>		2013-01-29 15:10:15 -08:00
..
boot	sparc: Fix piggyback with newer binutils.	2012-12-03 11:24:25 -08:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
crypto	sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.	2012-12-19 15:44:31 -08:00
include	sparc: remove __devinit, __devexit annotations	2013-01-12 15:28:45 -08:00
kernel	sparc: remove __devinit, __devexit annotations	2013-01-12 15:28:45 -08:00
lib	sparc: Support atomic64_dec_if_positive properly.	2012-11-09 19:37:59 -08:00
math-emu	sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.	2012-10-26 15:18:37 -07:00
mm	Merge remote-tracking branch 'origin/x86/boot' into x86/mm2	2013-01-29 15:10:15 -08:00
net	sparc: bpf_jit_comp: add VLAN instructions for BPF JIT	2012-11-06 17:41:42 -05: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	Bury the conditionals from kernel_thread/kernel_execve series	2012-12-19 18:07:38 -05: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