From: Arnd Bergmann Date: Sun, 22 Apr 2012 21:19:01 +0000 (+0200) Subject: Merge branch 'depends/i2c/lpc32xx' into next/dt X-Git-Tag: v3.12-rc1~3158^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48bfdb216ed7a2a75aa2909869f3266b3736f88a;p=kernel%2Fkernel-generic.git Merge branch 'depends/i2c/lpc32xx' into next/dt As a prerequisite for merging the lpc32xx DT changes, this pulls in the depends/i2c/lpc32xx branch that contains changes to the pnx-i2c driver, which are already in the i2c tree. The branch is available also on git://git.antcom.de/linux-2.6.git lpc32xx/i2c Roland Stigge writes: this is the series of the 4 patches adding device tree support to i2c-pnx (used by LPC32xx) that Wolfram Sang already applied to the i2c subsystem. Since both drivers/i2c/ and mach-lpc32xx are touched here, there will probably be conflicts that you need to be aware of. I'm posting this again for arm-soc since the actual mach-lpc32xx specific DT conversion builds upon those changes (see next pull request), especially in arch/arm/mach-lpc32xx/common.c. Wolfram already gave permission to merge this via arm-soc, but please coordinate and tell me if I can help resolving this. Further, this implicitly updates the next/dt branch to v3.4-rc4, which causes a trivial conflict from a change in one branch in code that gets removed in another. Signed-off-by: Arnd Bergmann [olof: rebuilt branch due to drop of an early merge] Signed-off-by: Olof Johansson --- 48bfdb216ed7a2a75aa2909869f3266b3736f88a