• Ben Dooks's avatar
    ARM: Merge for-2635/samsung-rtc · 14b8a0f9
    Ben Dooks authored
    Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
    
    Conflicts:
    	arch/arm/mach-s3c64xx/include/mach/map.h
    	arch/arm/plat-samsung/Kconfig
    	arch/arm/plat-samsung/Makefile
    14b8a0f9
Makefile 1.22 KB