• Simon Horman's avatar
    Merge branch 'soc' into pinmux-base · 809609a5
    Simon Horman authored
    Conflicts:
    	drivers/pinctrl/sh-pfc/pfc-r8a7740.c
    
    This merge is to provide r8a73a4 SoC files, which are added in the
    soc branch and depended on by r8a73a4 pfc-changes which are to
    be added to the pinmux branch.
    809609a5
pfc-r8a7740.c 98.5 KB