diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-10-12 09:51:18 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-12 09:51:18 +0200 |
commit | b9f27c0f4f7db9e5a4ba59228442a75d3177470c (patch) | |
tree | 49ab61b7e06a5a592f3541e84d1b5908a1d8030f /arch/um/include | |
parent | 9fc4468d546b6eb55b0aa5b04b0c36238ebf57e7 (diff) | |
parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
download | kernel_replicant_linux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.gz kernel_replicant_linux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.bz2 kernel_replicant_linux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.zip |
Merge tag 'v4.3-rc5' into timers/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index 149ec55f9c46..904f3ebf4220 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -25,4 +25,5 @@ generic-y += preempt.h generic-y += switch_to.h generic-y += topology.h generic-y += trace_clock.h +generic-y += word-at-a-time.h generic-y += xor.h |