diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:34:09 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:34:09 +0200 |
commit | 62fa78436e1beb17210df25b38c347ccb44b396b (patch) | |
tree | 9ebfa63bf46296150d11708fdabd2abbfb163fa5 /arch/m68k/include/uapi/asm/Kbuild | |
parent | ae21f41e1f569b51e69d8822005d72ed5b8c2e7f (diff) | |
parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
download | linux-62fa78436e1beb17210df25b38c347ccb44b396b.tar.bz2 |
Merge 5.1-rc3 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/include/uapi/asm/Kbuild')
-rw-r--r-- | arch/m68k/include/uapi/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 8a7ad40be463..7417847dc438 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -1,2 +1 @@ generated-y += unistd_32.h -generic-y += kvm_para.h |