Next branch of Renesas tree for Fri 28 Apr 2017

Based on v4.11-rc1
Merge branch 'fixes-for-v4.12' into next