diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 10:30:58 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-08 11:32:21 +0100 |
| commit | 5ccd3bd992cf668b5a6fa1713da7b443a35e2930 (patch) | |
| tree | e55f60946cf658ab396a1a0401833b67e71de196 /include/linux/mfd/git:/ssh:/git@git.zx2c4.com | |
| parent | ARM: 8867/1: vdso: pass --be8 to linker if necessary (diff) | |
| parent | ARM: 8863/1: stm32: select ARM errata 814220 (diff) | |
| download | linux-dev-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.tar.xz linux-dev-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.zip | |
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 'include/linux/mfd/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions