]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:08:12 +0000 (11:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:08:12 +0000 (11:08 +1000)
commit0da448cb41ca708d904975a5b011f145a2383d8c
tree141789808e57aa730408b628a90d6558341c4ed3
parent03e91d2a747e248eb018e91b54324031c75e6b03
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