projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5d0e49 f785b42)
Merge branches 'fixes' and 'misc'
authorRussell King <rmk+kernel@armlinux.org.uk>
Wed, 3 Jul 2019 09:30:58 +0000 (10:30 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 8 Jul 2019 10:32:21 +0000 (11:32 +0100)
commit5ccd3bd992cf668b5a6fa1713da7b443a35e2930
treee55f60946cf658ab396a1a0401833b67e71de196tree
parentc5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27dcommit | diff
parentf785b42f4cb5a63eeb3f9037acf35b827aabb328commit | 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>
arch/arm/vdso/Makefile diff1 | diff2 | blob | history
MicroBlaze GIT Repository