]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:51:10 +0000 (11:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:51:10 +0000 (11:51 +1000)
commitab45f28d61f251e114ad9d88c529465a05adbc8c
tree7ec0c2bdfca246e56e19790f4bcb204b1b89794f
parent1e06af74e21c02992b18e2dc924a7d3cfe917a4a
parent2bdbfa9c4a14f0015d1e189b17175a989d7c2a40
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

Conflicts:
drivers/i2c/busses/i2c-omap.c
16 files changed:
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/at91sam9rl_devices.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-davinci.c
drivers/i2c/busses/i2c-imx.c
drivers/i2c/busses/i2c-omap.c