Added back arch/arm/mach-omap/time.c and removed drivers/i2c/chips/tps65010.c to avoid merge conflicts.
Attach a file by drag & drop or click to upload