From: Tony Lindgren <tony@atomide.com>
Date: Fri, 22 May 2009 19:36:22 +0000 (-0700)
Subject: Fix mismerge for mmc-twl4030.c
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~127
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e3682cf72d00bbae18d469304f0cbd99777b9d1;p=pandora-kernel.git

Fix mismerge for mmc-twl4030.c

Patch e51151a53fc85fb1730ec4d6c1474275dcdb9ec3 fixed the names
in the mainline tree but the changes got only partially merged
to l-o tree.

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

Reading git-diff-tree failed