linux-next: manual merge of the crypto tree with the imx-mxs tree

[Stephen Rothwell]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/arm/configs/imx_v6_v7_defconfig

between commit:

  351265f46291 ("ARM: imx_v6_v7_defconfig: build in audio driver")

from the imx-mxs tree and commit:

  ab86ca0755ec ("ARM: imx_v6_v7_defconfig: Select CAAM")

from the crypto tree.

I fixed it up (they both removed the same line) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/