Signed-off-by: NRyo Kataoka <ryo.kataoka.wt@renesas.com>
[horms: resolved conflicts]
Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>