Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig arch/arm/Makefile
Showing
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
arch/arm/mach-s5p6442/cpu.c
0 → 100644
arch/arm/mach-s5pv210/cpu.c
0 → 100644
File moved
Please register or sign in to comment