• K
    Merge branch 'next-samsung' into for-next · d61bd77f
    Kukjin Kim 提交于
    Conflicts:
    	arch/arm/mach-s5p6440/Kconfig
    	arch/arm/mach-s5p6442/Kconfig
    	arch/arm/mach-s5pc100/Kconfig
    	arch/arm/mach-s5pv210/Kconfig
    	arch/arm/mach-s5pv210/cpu.c
    	arch/arm/plat-samsung/include/plat/sdhci.h
    d61bd77f
cpu.c 3.5 KB