From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Mar 2009 23:21:16 +0000 (-0700)
Subject: ucc_geth: Fix merge error.
X-Git-Tag: v2.6.30-rc1~662^2~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=039a6f6a39d2aa30ee53afdb213ea6dd4482928b;p=pandora-kernel.git

ucc_geth: Fix merge error.

I left a merge failure unresolved, noticed by Stephen
Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed