From: Tony Lindgren Date: Wed, 29 Jun 2005 13:21:36 +0000 (-0700) Subject: ARM: OMAP: Temporary change to avoid merge conflicts X-Git-Tag: v2.6.13-omap1~107 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e08f778717429b9b608b39a0039c37cf32eb84;p=pandora-kernel.git 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. --- Reading git-diff-tree failed