summaryrefslogtreecommitdiffstats
path: root/drivers/ide/rapide.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-05 19:29:24 +0200
committerMark Brown <broonie@linaro.org>2014-08-05 19:29:24 +0200
commitd5b5d9d43b5e1b1c43a00ad15a3605a41270e761 (patch)
treec66f9376324c5d4a11a83645a3cf639d437c2f99 /drivers/ide/rapide.c
parentMerge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/get... (diff)
parentregulator: lp8755: Use devm_regulator_register (diff)
parentregulator: ltc3589: Staticize ltc3589_reg_defaults (diff)
parentregulator: max8952: Convert to devm_gpio_request_one() (diff)
parentregulator: mc13xxx: Remove unnecessary locks (diff)
parentregulator: palmas: Fix SMPS enable/disable/is_enable for tps65917 (diff)
downloadlinux-d5b5d9d43b5e1b1c43a00ad15a3605a41270e761.tar.xz
linux-d5b5d9d43b5e1b1c43a00ad15a3605a41270e761.zip
Merge remote-tracking branches 'regulator/topic/lp8755', 'regulator/topic/ltc3589', 'regulator/topic/max8952', 'regulator/topic/mc13xxx' and 'regulator/topic/palmas' into regulator-next