Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

Conflicts:
	drivers/i2c/busses/i2c-omap.c

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-davinci.c
index 79a2542d8c41564b1c2b7a337e23a8a0282cda4f,85ce548ff1526672fe383c663e97a75814704ce7..6a0a5531944994803b94cbbe95b8badf7bdbb42c
--- 1/drivers/i2c/busses/i2c-davinci.c
--- 2/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@@ -38,9 -38,11 +38,11 @@@
  #include <linux/slab.h>
  #include <linux/cpufreq.h>
  #include <linux/gpio.h>
+ #include <linux/of_i2c.h>
+ #include <linux/of_device.h>
  
  #include <mach/hardware.h>
 -#include <mach/i2c.h>
 +#include <linux/platform_data/i2c-davinci.h>
  
  /* ----- global defines ----------------------------------------------- */
  

diff --cc drivers/i2c/busses/i2c-imx.c
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
index a0e49f6aaf96eaa81ac712a4a279fafbdf13af95,c78431a4970a814a814baac01a518c0f1e7112c8..0b0254312d21f7f39e902e15c8862334d41045ad
--- 1/drivers/i2c/busses/i2c-omap.c
--- 2/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@@ -943,12 -1051,11 +1051,12 @@@ omap_i2c_probe(struct platform_device *
  {
        struct omap_i2c_dev     *dev;
        struct i2c_adapter      *adap;
-       struct resource         *mem, *irq, *ioarea;
+       struct resource         *mem;
 -      struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
 +      const struct omap_i2c_bus_platform_data *pdata =
 +              pdev->dev.platform_data;
        struct device_node      *node = pdev->dev.of_node;
        const struct of_device_id *match;
-       irq_handler_t isr;
+       int irq;
        int r;
  
        /* NOTE: driver uses the static register mapping */