diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 12:30:58 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-08 13:32:21 +0300 |
| commit | 5ccd3bd992cf668b5a6fa1713da7b443a35e2930 (patch) | |
| tree | e55f60946cf658ab396a1a0401833b67e71de196 /arch/x86/include/asm/special_insns.h | |
| parent | c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d (diff) | |
| parent | f785b42f4cb5a63eeb3f9037acf35b827aabb328 (diff) | |
| download | linux-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.tar.xz | |
Merge branches 'fixes' and 'misc'
Fix up the conflict between "VDSO: Drop implicit common-page-size
linker flag" and "vdso: pass --be8 to linker if necessary"
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/x86/include/asm/special_insns.h')
0 files changed, 0 insertions, 0 deletions