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

From: Stephen Rothwell
Date: Tue Aug 11 2015 - 23:22:48 EST

Hi Herbert,

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


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).

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
Please read the FAQ at