Merge branch 'samsung/driver' into next/drivers

Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/mach-exynos/Makefile
index db527ab,64d14f9..5fc202c
--- 1/arch/arm/mach-exynos/Makefile
--- 2/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -47,8 -49,8 +49,9 @@@ obj-$(CONFIG_EXYNOS4_DEV_PD)          += dev-pd
  obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)      += dev-sysmmu.o
  obj-$(CONFIG_EXYNOS4_DEV_DWMCI)               += dev-dwmci.o
  obj-$(CONFIG_EXYNOS4_DEV_DMA)         += dma.o
 +obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)    += dev-ohci.o
  
+ obj-$(CONFIG_ARCH_EXYNOS4)            += setup-i2c0.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMC)      += setup-fimc.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)     += setup-fimd0.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C1)      += setup-i2c1.o

diff --cc arch/arm/mach-exynos/include/mach/map.h
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
index b805e59,586eb99..2b11e04
--- 1/arch/arm/mach-exynos/mach-origen.c
--- 2/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -41,9 -41,10 +41,11 @@@
  #include <plat/fb.h>
  #include <plat/mfc.h>
  
 +#include <mach/ohci.h>
  #include <mach/map.h>
  
+ #include "common.h"
+ 
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define ORIGEN_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
                                 S3C2410_UCON_RXILEVEL |        \

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 25a5a40,a27b23e..b2c5557
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -42,8 -42,9 +42,10 @@@
  #include <plat/clock.h>
  
  #include <mach/map.h>
 +#include <mach/ohci.h>
  
+ #include "common.h"
+ 
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |        \
                                 S3C2410_UCON_RXILEVEL |        \

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-mmp/avengers_lite.c
Simple merge

diff --cc arch/arm/mach-mmp/brownstone.c
Simple merge

diff --cc arch/arm/mach-mmp/flint.c
Simple merge

diff --cc arch/arm/mach-mmp/gplugd.c
Simple merge

diff --cc arch/arm/mach-mmp/include/mach/pxa168.h
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-mmp/tavorevb.c
Simple merge

diff --cc arch/arm/mach-mmp/teton_bga.c
Simple merge

diff --cc arch/arm/mach-mmp/ttc_dkb.c
Simple merge

diff --cc arch/arm/mach-mxs/include/mach/common.h
index 3bbb94f,1388485..e1237ab
--- 1/arch/arm/mach-mxs/include/mach/common.h
--- 2/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@@ -16,7 -16,7 +16,8 @@@ struct clk
  extern const u32 *mxs_get_ocotp(void);
  extern int mxs_reset_block(void __iomem *);
  extern void mxs_timer_init(struct clk *, int);
+ extern void mxs_restart(char, const char *);
 +extern int mxs_saif_clkmux_select(unsigned int clkmux);
  
  extern int mx23_register_gpios(void);
  extern int mx23_clocks_init(void);

diff --cc arch/arm/mach-mxs/mach-mx28evk.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-sa1100/generic.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/irqs.h
Simple merge