Merge branch 'v4.11/fixes-non-critical' into v4.11/soc

This merge is because patches in branch v4.11/soc conflict
with cleanup done as part of 0a501167 ("ARM: davinci:
da850: coding style fix") that is already queued as a
non-critical fix.