Hello Stephen,
Thank you very much for this fix.
BR,
Bintian
On 2015/5/29 18:45, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock
drivers into drivers/clk") from the imx-mxs tree and commit
b1691707eccd ("clk: hi6220: Clock driver support for Hisilicon hi6220
SoC") from the clk tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
