Conflicts: arch/arm/plat-omap/dmtimer.c Resolved as suggested by Jon Hunter.
Attach a file by drag & drop or click to upload
