• Ben Dooks's avatar
    ARM: Merge next-s3c64xx-updates · 009f742b
    Ben Dooks authored
    Merge branch 'next-s3c64xx-updates' into for-rmk
    
    Conflicts:
    
    	arch/arm/plat-s3c/dev-hsmmc2.c
    	arch/arm/plat-s3c/include/plat/sdhci.h
    009f742b
dev-hsmmc2.c 1.66 KB