projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28bceea bfa1ce5)
Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 19 Jun 2015 14:07:07 +0000 (22:07 +0800)
Merge the mvebu/drivers branch of the arm-soc tree which contains
just a single patch bfa1ce5f38938cc9e6c7f2d1011f88eba2b9e2b2 ("bus:
mvebu-mbus: add mv_mbus_dram_info_nooverlap()") that happens to be
a prerequisite of the new marvell/cesa crypto driver.

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

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
Domain: System / Kernel;