Messages in this thread | | | Date | Thu, 13 Sep 2012 09:09:48 +0200 | From | Uwe Kleine-König <> | Subject | Re: linux-next: manual merge of the arm-soc tree with the i2c-embedded tree |
| |
Hi Stephen,
On Thu, Sep 13, 2012 at 04:41:20PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/i2c/busses/i2c-omap.c between commit d9ebd04d3476 ("i2c: omap: > switch to devm_* API") from the i2c-embedded tree and commit 07baca6f8fc2 > ("i2c/i2c-omap: add a const qualifier") from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). looks correct.
Thanks Uwe
-- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |