From: Olof Johansson Date: Tue, 25 Jun 2013 18:23:16 +0000 (-0700) Subject: Merge branch 'next/drivers' into for-next X-Git-Tag: next-20130628~18^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=14c30680117980ab14a9d81c8d20b9c16684a973;p=karo-tx-linux.git Merge branch 'next/drivers' into for-next * next/drivers: crypto: ux500: use dmaengine_submit API crypto: ux500: use dmaengine_prep_slave_sg API crypto: ux500: use dmaengine_device_control API crypto: ux500/crypt: add missing __iomem qualifiers crypto: ux500/hash: add missing static qualifiers crypto: ux500/hash: use readl on iomem addresses dmaengine: ste_dma40: Declare memcpy config as static dmaengine: ste_dma40: fix error return code in d40_probe() Signed-off-by: Olof Johansson --- 14c30680117980ab14a9d81c8d20b9c16684a973