Merge git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux next
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Feb 2019 04:44:57 +0000 (12:44 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Feb 2019 04:44:57 +0000 (12:44 +0800)
Pull changes from Freescale SoC drivers tree that are required by
subsequent caam/qi2 patches.

1  2 
drivers/crypto/caam/caamalg_qi2.c

Simple merge