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>

diff --cc arch/arm/vdso/Makefile
index 1f5ec9741e6d4af568e93f1193a34844fa882ad8,db1754438267a8873f09287b1bd6ece049dc9f0e..ca85df2477751d397d38a1b36e1ec4424cf55163
--- 1/arch/arm/vdso/Makefile
--- 2/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@@ -10,10 -10,8 +10,9 @@@ obj-vdso := $(addprefix $(obj)/, $(obj-
  ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector
  ccflags-y += -DDISABLE_BRANCH_PROFILING
  
 -ldflags-y = -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
 -          -z max-page-size=4096 -nostdlib -shared \
 +ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8
 +ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
-           -z max-page-size=4096 -z common-page-size=4096 \
-           -nostdlib -shared $(ldflags-y) \
++          -z max-page-size=4096 -nostdlib -shared $(ldflags-y) \
            $(call ld-option, --hash-style=sysv) \
            $(call ld-option, --build-id) \
            -T