Merge branch 'marvell_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux...
authorArnd Bergmann <arnd@arndb.de>
Wed, 16 May 2012 13:44:34 +0000 (15:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 16 May 2012 13:44:34 +0000 (15:44 +0200)
commit139abbf5ef977fe7cf638f4c4d0f03cc74ad8180
tree7d93a9193fae86c8a456f0870c154a60fc70ccfb
parent36be50515fe2aef61533b516fa2576a2c7fe7664
parent1ebfefcf37a6e308266a8d786e8cfea0a454058c
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: Arnd Bergmann <arnd@arndb.de>