Merge branch 'devel-stable' into for-next

diff --combined arch/arm/Makefile
index e9d1fd6067c69eeb0a1fcefa55a75b5ed4722c62,eb7bb511f853d975d67c0ee26c1167b2d5054279..5575d9fa8806cd5f74409242a7041f2e96b16453
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -13,7 -13,7 +13,7 @@@
  # Ensure linker flags are correct
  LDFLAGS               :=
  
 -LDFLAGS_vmlinux       :=-p --no-undefined -X
 +LDFLAGS_vmlinux       :=-p --no-undefined -X --pic-veneer
  ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
  LDFLAGS_vmlinux       += --be8
  LDFLAGS_MODULE        += --be8
@@@ -150,6 -150,7 +150,7 @@@ machine-$(CONFIG_ARCH_BERLIN)              += berli
  machine-$(CONFIG_ARCH_CLPS711X)               += clps711x
  machine-$(CONFIG_ARCH_CNS3XXX)                += cns3xxx
  machine-$(CONFIG_ARCH_DAVINCI)                += davinci
+ machine-$(CONFIG_ARCH_DIGICOLOR)      += digicolor
  machine-$(CONFIG_ARCH_DOVE)           += dove
  machine-$(CONFIG_ARCH_EBSA110)                += ebsa110
  machine-$(CONFIG_ARCH_EFM32)          += efm32
@@@ -263,7 -264,6 +264,7 @@@ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE
  core-$(CONFIG_VFP)            += arch/arm/vfp/
  core-$(CONFIG_XEN)            += arch/arm/xen/
  core-$(CONFIG_KVM_ARM_HOST)   += arch/arm/kvm/
 +core-$(CONFIG_VDSO)           += arch/arm/vdso/
  
  # If we have a machine-specific directory, then include it in the build.
  core-y                                += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
@@@ -321,12 -321,6 +322,12 @@@ dtbs: prepare script
  dtbs_install:
        $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
  
 +PHONY += vdso_install
 +vdso_install:
 +ifeq ($(CONFIG_VDSO),y)
 +      $(Q)$(MAKE) $(build)=arch/arm/vdso $@
 +endif
 +
  # We use MRPROPER_FILES and CLEAN_FILES now
  archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
@@@ -351,5 -345,4 +352,5 @@@ define archhel
    echo  '                  Install using (your) ~/bin/$(INSTALLKERNEL) or'
    echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'
    echo  '                  install to $$(INSTALL_PATH) and run lilo'
 +  echo  '  vdso_install  - Install unstripped vdso.so to $$(INSTALL_MOD_PATH)/vdso'
  endef