Merge branch 'devel-stable' into devel

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index 7603eba,8c0d08f..fa0cdab
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -177,12 -177,11 +178,12 @@@ machine-$(CONFIG_ARCH_MXC91231)         := mxc
  plat-$(CONFIG_ARCH_MXC)               := mxc
  plat-$(CONFIG_ARCH_OMAP)      := omap
  plat-$(CONFIG_PLAT_IOP)               := iop
 +plat-$(CONFIG_PLAT_NOMADIK)   := nomadik
  plat-$(CONFIG_PLAT_ORION)     := orion
  plat-$(CONFIG_PLAT_PXA)               := pxa
- plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx s3c
- plat-$(CONFIG_PLAT_S3C64XX)   := s3c64xx s3c
- plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx s3c
+ plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx s3c samsung
+ plat-$(CONFIG_PLAT_S3C64XX)   := s3c64xx s3c samsung
+ plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx s3c samsung
  plat-$(CONFIG_ARCH_STMP3XXX)  := stmp3xxx
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/mm/Makefile
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge