From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 13:41:21 +0000 (-0700)
Subject: ARM: OMAP: Manually merged drivers/char/watchdog/Makefile
X-Git-Tag: v2.6.13-omap1~103
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7950073d43120a4b82b261e2a990e8760bedc628;p=pandora-kernel.git

ARM: OMAP: Manually merged drivers/char/watchdog/Makefile

Manually merged drivers/char/watchdog/Makefile
---

Reading git-diff-tree failed