Skip to content
Commit 139abbf5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'marvell_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux into fixes 

* 'marvell_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux

:
  crypto: mv_cesa requires on CRYPTO_HASH to build

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 36be5051 1ebfefcf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment