1
linux/arch/arm/mach-s5pv310/include
Kukjin Kim 285dee7ff4 Merge branch 'next-s5pv310' into for-next
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
2010-12-31 10:52:05 +09:00
..
mach Merge branch 'next-s5pv310' into for-next 2010-12-31 10:52:05 +09:00