• Kevin Hilman's avatar
    Merge tag 'v4.1-rc6' into next/dt · ecdf94da
    Kevin Hilman authored
    Linux 4.1-rc6
    
     Conflicts:
    	arch/arm/boot/dts/zynq-7000.dtsi
    
    Resolution summary:
    
     Mainline had an earlier version of the commit, resolve in favor of the
     newer patch in next/dt branch.
    ecdf94da
armada-39x.dtsi 13.6 KB