Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
Attach a file by drag & drop or click to upload
