Merge branch 'for-rmk' of...
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/mach-nuri.c
Showing
arch/arm/mach-exynos4/cpuidle.c
0 → 100644
arch/arm/mach-s5p6442/Kconfig
已删除
100644 → 0
arch/arm/mach-s5p6442/clock.c
已删除
100644 → 0
arch/arm/mach-s5p6442/cpu.c
已删除
100644 → 0
arch/arm/mach-s5p6442/dma.c
已删除
100644 → 0
arch/arm/mach-s5p6442/init.c
已删除
100644 → 0
想要评论请 注册 或 登录