]> 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>
Wed, 10 Oct 2012 00:23:42 +0000 (11:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 00:23:42 +0000 (11:23 +1100)
commitb7bf318a8a4bf2e91af0270c61a9a21be3438308
tree9ca685aaf8ce4585aea09cd0f965e25170c1f09f
parent64a2c199c159a63eb1e7a7c654bff0419b5e55ea
parent62885f59a26195d9f6a3f8c795225dfbab62a110
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

Conflicts:
drivers/i2c/busses/i2c-omap.c
15 files changed:
arch/arm/boot/dts/imx28.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
arch/arm/plat-omap/i2c.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-davinci.c
drivers/i2c/busses/i2c-imx.c
drivers/i2c/busses/i2c-mpc.c
drivers/i2c/busses/i2c-omap.c
drivers/i2c/busses/i2c-s3c2410.c