Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-pins.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
index 2a08c07dec6dfd3c9d44cb837f4f43e01ea75e77,2a08c07dec6dfd3c9d44cb837f4f43e01ea75e77,bb26f40493e697ffe9a6805ae65acd896b9e12e5,2a08c07dec6dfd3c9d44cb837f4f43e01ea75e77,2a08c07dec6dfd3c9d44cb837f4f43e01ea75e77,2a08c07dec6dfd3c9d44cb837f4f43e01ea75e77,4eead1a0786b57506059e50c711491c99e3b358e..cd54abaccd96460e1a821d574223887dedb82f86
--- 1/arch/arm/mach-ux500/board-mop500.c
--- 2/arch/arm/mach-ux500/board-mop500.c
--- 3/arch/arm/mach-ux500/board-mop500.c
--- 4/arch/arm/mach-ux500/board-mop500.c
--- 5/arch/arm/mach-ux500/board-mop500.c
--- 6/arch/arm/mach-ux500/board-mop500.c
--- 7/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@@@@@@ -26,9 -26,9 -26,8 -26,9 -26,9 -26,9 -26,10 +26,11 @@@@@@@@
       #include <linux/mfd/ab8500/gpio.h>
       #include <linux/leds-lp5521.h>
       #include <linux/input.h>
++++++ #include <linux/smsc911x.h>
       #include <linux/gpio_keys.h>
  +   +#include <linux/delay.h>
       
++++++ #include <linux/leds.h>
       #include <asm/mach-types.h>
       #include <asm/mach/arch.h>
       

diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge