Merge branch 'regmap-asoc' into for-3.2