Messages in this thread | | | Subject | Re: linux-next: manual merge of the clk tree with the arm-soc tree | From | Pawel Moll <> | Date | Fri, 19 Apr 2013 10:47:56 +0100 |
| |
On Fri, 2013-04-19 at 08:27 +0100, Stephen Rothwell wrote: > Hi Mike, > > Today's linux-next merge of the clk tree got a conflict in > arch/arm/mach-vexpress/v2m.c between commit dabfd8fb84ab ("ARM: vexpress: > remove sp804 OF init") from the arm-soc tree and commit 6e973d2c4385 > ("clk: vexpress: Add separate SP810 driver") from the clk tree. > > I fixed it up (I thnk - see below) and can carry the fix as necessary (no > action is required).
Yep, this merge is fine, thanks!
Paweł
-- 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/
| |