Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7740.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7779.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7790.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-sh73a0.c
Simple merge