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
Showing
arch/arm/mach-s5pv310/cpu.c
0 → 100644
arch/arm/mach-s5pv310/init.c
0 → 100644
arch/arm/mach-s5pv310/time.c
0 → 100644
arch/arm/plat-s5p/dev-pmu.c
0 → 100644
Please register or sign in to comment