commit | 5ccd3bd992cf668b5a6fa1713da7b443a35e2930 | [log] [tgz] |
---|---|---|
author | Russell King <rmk+kernel@armlinux.org.uk> | Wed Jul 03 10:30:58 2019 +0100 |
committer | Russell King <rmk+kernel@armlinux.org.uk> | Mon Jul 08 11:32:21 2019 +0100 |
tree | e55f60946cf658ab396a1a0401833b67e71de196 | |
parent | c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d [diff] | |
parent | f785b42f4cb5a63eeb3f9037acf35b827aabb328 [diff] |
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>