linux/arch/um/include/shared
Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-11-07 10:32:44 +01:00
..
skas um: stub-data.h: remove superfluous include 2017-07-07 10:44:49 +02:00
aio.h
arch.h um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
as-layout.h um: Move uml_postsetup in the init_thread stack 2015-04-13 21:17:44 +02:00
common-offsets.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
elf_user.h
frame_kern.h um: Use get_signal() signal_setup_done() 2014-08-06 13:03:41 +02:00
init.h Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
irq_kern.h um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
irq_user.h um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
kern.h um: trim kern.h 2011-11-02 14:15:07 +01:00
kern_util.h um: Fix do_signal() prototype 2015-07-07 10:58:54 +02:00
longjmp.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mem.h
mem_user.h um: delete unnecessary bootmem struct page array 2014-10-13 17:15:09 +02:00
net_kern.h um: net: use eth_hw_addr_random() to generate random mac 2013-01-03 22:37:36 -08:00
net_user.h uml: UML net driver does not allow for vlans 2009-06-16 19:47:46 -07:00
os.h um: Fix FP register size for XSTATE/XSAVE 2017-09-13 22:24:38 +02:00
ptrace_user.h um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00
registers.h um: add extended processor state save/restore support 2016-05-21 23:38:06 +02:00
sigio.h
timer-internal.h um: Switch clocksource to hrtimers 2015-11-06 22:54:49 +01:00
um_malloc.h um: get rid of kern_constants.h 2011-11-02 14:14:45 +01:00
user.h um: Stop abusing __KERNEL__ 2015-05-31 22:05:32 +02:00