From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 May 2008 07:34:43 +0000 (+0200)
Subject: ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
X-Git-Tag: v2.6.26-omap1~123^2~95
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52f241c6ef362abcf454c1d1ef5fd6225533038f;p=pandora-kernel.git

ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code

This patch fixes the merge-damage in the beagleboard RTC code

Signed-off-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed