ARM: OMAP: Temporary change to avoid merge conflicts

Added back arch/arm/mach-omap/time.c and removed drivers/i2c/chips/tps65010.c to avoid merge conflicts.

ARM: OMAP: Temporary change to avoid merge conflicts
Added back arch/arm/mach-omap/time.c and removed drivers/i2c/chips/tps65010.c to avoid merge conflicts.
87e08f77 · Tony Lindgren · 3ac3af29 · 87e08f77 · 3ac3af29
Commit 87e08f77 authored Jun 29, 2005 by Tony Lindgren
Expand all Show whitespace changes
Inline Side-by-side

Showing with 384 additions and 1072 deletions

arch/arm/mach-omap/time.c arch/arm/mach-omap/time.c +384 -0

drivers/i2c/chips/tps65010.c drivers/i2c/chips/tps65010.c +0 -1072

No files found.
--- a/arch/arm/mach-omap/time.c
+++ b/arch/arm/mach-omap/time.c
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c