review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

author	H. Peter Anvin <hpa@linux.intel.com>
	Sat, 22 Sep 2012 00:18:44 +0000 (17:18 -0700)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Sat, 22 Sep 2012 00:18:44 +0000 (17:18 -0700)
commit	49b8c695e331c9685e6ffdbf34872509d77c8459
tree	d4afdfae0115b2ab56687d23d6329d6ad934788f	tree \| snapshot
parent	e59d1b0a24199db01978e6c1e89859eda93ce683	commit \| diff
parent	b1a74bf8212367be2b1d6685c11a84e056eaaaf1	commit \| diff

Merge branch 'x86/fpu' into x86/smap

Reason for merge:
       x86/fpu changed the structure of some of the code that x86/smap
       changes; mostly fpu-internal.h but also minor changes to the
       signal code.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
arch/x86/ia32/ia32_signal.c
arch/x86/include/asm/fpu-internal.h
arch/x86/kernel/signal.c

Domain: System / Kernel;

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32_signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/fpu-internal.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/xsave.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history