From: Tony Lindgren Date: Thu, 28 Jul 2005 09:04:00 +0000 (-0700) Subject: ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline X-Git-Tag: v2.6.13-omap1~45 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3856bce7f6699f3a9749124cfb07f9c907c33e9f;p=pandora-kernel.git ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline Fixed merge conflict in board.h before syncing with mainline --- Reading git-diff-tree failed