]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ac3af2) | patch
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)
commit87e08f778717429b9b608b39a0039c37cf32eb84
tree966f0d189f9e8e682c38c1016d02a78b16c31985tree | snapshot
parent3ac3af2972557dabde0067f87c69c8557f2907c6commit | diff
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.
arch/arm/mach-omap/time.c [new file with mode: 0644] blob
drivers/i2c/chips/tps65010.c [deleted file] blob | history
Unnamed repository; edit this file 'description' to name the repository.