diff options
author | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
commit | 6b7dcb536e3535444c39286333f10d06d2f44fb5 (patch) | |
tree | 6a4c1e30e5900626e506d46b100d21a2fcd59003 /arch/s390/numa/Makefile | |
parent | Merge tag 'drm-misc-next-2017-12-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
parent | Linux 4.15-rc4 (diff) | |
download | linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.tar.xz linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.zip |
BackMerge tag 'v4.15-rc4' into drm-next
Linux 4.15-rc4
Daniel requested it to fix some messy conflicts.
Diffstat (limited to 'arch/s390/numa/Makefile')
-rw-r--r-- | arch/s390/numa/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/numa/Makefile b/arch/s390/numa/Makefile index f94ecaffa71b..66c2dff74895 100644 --- a/arch/s390/numa/Makefile +++ b/arch/s390/numa/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 obj-y += numa.o obj-y += toptree.o obj-$(CONFIG_NUMA_EMU) += mode_emu.o |