Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

author Herbert Xu <herbert@gondor.apana.org.au>

Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)

committer Herbert Xu <herbert@gondor.apana.org.au>

Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
author Herbert Xu <herbert@gondor.apana.org.au>
Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
committer Herbert Xu <herbert@gondor.apana.org.au>
Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/crypto/n2_core.c
Simple merge
diff --cc lib/Kconfig
Simple merge
diff --cc lib/Makefile
Simple merge
author	Herbert Xu <herbert@gondor.apana.org.au>
	Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
committer	Herbert Xu <herbert@gondor.apana.org.au>
	Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/n2_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history