f56f52e02a
Conflicts: arch/arm/plat-omap/dmtimer.c Resolved as suggested by Jon Hunter.
Conflicts: arch/arm/plat-omap/dmtimer.c Resolved as suggested by Jon Hunter.