Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/boot/dts/snowball.dts

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/dts/dbx5x0.dtsi
Simple merge

diff --cc arch/arm/boot/dts/href.dtsi
Simple merge

diff --cc arch/arm/boot/dts/snowball.dts
index d3ec32f6b79073fc7171f966f47257cac86aabfb,b095e85d93c8e1e3f362b92d934b745cf333ada8..db5db24fd54407233b42aa1cc4b202e589eabdd0
--- 1/arch/arm/boot/dts/snowball.dts
--- 2/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@@ -298,7 -298,11 +298,11 @@@
                                };
                        };
  
 -                      ab8500@5 {
 +                      ab8500 {
+                               ab8500-gpio {
+                                       compatible = "stericsson,ab8500-gpio";
+                               };
+ 
                                ab8500-regulators {
                                        ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
                                                regulator-name = "V-DISPLAY";

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/plat-orion/Makefile
index bbc0d6b6aac4323ad91b0a508530c5f6e66e8c80,ad97400ba3ada182f934947dcaa4bd47cf45dc7c..b1c2a1285b583b1581f57c140801ae8dd6c3ece8
--- 1/arch/arm/plat-orion/Makefile
--- 2/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@@ -3,8 -3,12 +3,12 @@@
  #
  ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
  
- obj-y                             += addr-map.o
+ obj-$(CONFIG_ARCH_MVEBU)          += addr-map.o
+ obj-$(CONFIG_ARCH_KIRKWOOD)       += addr-map.o
+ obj-$(CONFIG_ARCH_DOVE)           += addr-map.o
+ obj-$(CONFIG_ARCH_ORION5X)        += addr-map.o
+ obj-$(CONFIG_ARCH_MV78XX0)        += addr-map.o
  
 -orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o
 +orion-gpio-$(CONFIG_GPIOLIB)      += gpio.o
  obj-$(CONFIG_PLAT_ORION_LEGACY)   += irq.o pcie.o time.o common.o mpp.o
  obj-$(CONFIG_PLAT_ORION_LEGACY)   += $(orion-gpio-y)

diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-samsung.c
Simple merge