ARM: OMAP: Temporary change to avoid merge conflicts
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 13:21:36 +0000 (06:21 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 13:21:36 +0000 (06:21 -0700)
Added back arch/arm/mach-omap/time.c and removed
drivers/i2c/chips/tps65010.c to avoid merge conflicts.


No differences found