arch/arm/mach-s5pv310/mach-smdkv310.c · 285dee7ff4fb4b32838694d4378f4aa938cf5b43 · nexedi / linux

Merge branch 'next-s5pv310' into for-next · 285dee7f

Kukjin Kim authored Dec 31, 2010

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

mach-smdkv310.c 5.95 KB

Replace mach-smdkv310.c