From: Tony Lindgren <tony@atomide.com>
Date: Fri, 20 Feb 2009 18:48:01 +0000 (-0800)
Subject: i2c-omap: Fix mismerge
X-Git-Tag: v2.6.29-omap1~80
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb45c5ac8111b6307bf89717315db6ef21f5689;p=pandora-kernel.git

i2c-omap: Fix mismerge

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed