]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 07:34:43 +0000 (09:34 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 16 May 2008 15:31:30 +0000 (08:31 -0700)
commit52f241c6ef362abcf454c1d1ef5fd6225533038f
tree5f3544984d04c32fd62594089772e8af485f569f
parent1b6e46b1e1c83d827887566967ce67cc9ce95899
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>
arch/arm/mach-omap2/board-omap3beagle.c