Merge tag 'tags/fixes-non-3.11-1' into mvebu/regmap