• Kukjin Kim's avatar
    Merge branch 'next-s5pv310' into for-next · 285dee7f
    Kukjin Kim authored
    Conflicts:
    	arch/arm/mach-s5pv310/Kconfig
    	arch/arm/mach-s5pv310/Makefile
    	arch/arm/mach-s5pv310/mach-smdkc210.c
    	arch/arm/mach-s5pv310/mach-smdkv310.c
    	arch/arm/plat-samsung/include/plat/devs.h
    285dee7f
irqs.h 3.58 KB