summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/rockchip/rk3288_crypto.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-13 09:19:35 +0100
committerMark Brown <broonie@kernel.org>2016-03-13 09:19:35 +0100
commitd1f83021d5ca993242105f7b41f924614501fce5 (patch)
tree88d0376d25a9706f8d2094bf51e2deb609d8584a /drivers/crypto/rockchip/rk3288_crypto.c
parentMerge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/ac... (diff)
parentregulator: helper: Add helper to configure active-discharge using regmap (diff)
parentregulator: fan53555: fill set_suspend_enable/disable callback (diff)
parentregulator: gpio: don't print error on EPROBE_DEFER (diff)
parentregulator: hi655x: enable regulator for hi655x PMIC (diff)
parentregulator: lp872x: Add enable GPIO pin support (diff)
downloadlinux-d1f83021d5ca993242105f7b41f924614501fce5.tar.xz
linux-d1f83021d5ca993242105f7b41f924614501fce5.zip
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next