• O
    Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc · a5f17d1f
    Olof Johansson 提交于
    There were conflicts between fixes going in after 3.3-rc1 and
    Russell's stable arm-soc base branch. Resolving it in the dependency
    branch so that each topic branch shares the same resolution.
    
    Conflicts:
    	arch/arm/mach-at91/at91cap9.c
    	arch/arm/mach-at91/at91sam9g45.c
    a5f17d1f
mm-imx5.c 6.2 KB