From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 2 Nov 2006 17:23:33 +0000 (+0000)
Subject: [MIPS] Fix merge screwup by patch(1)
X-Git-Tag: v2.6.19-rc5~66^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a88ca8f7fd15d06e53a848c6b3558ed9973327c;p=pandora-kernel.git

[MIPS] Fix merge screwup by patch(1)

Patch happily applied an Ocelot G patch to Ocelot C when merging
linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into
kernel.org as 6ceb6d3ab2d402cea326320a4143db90a66fd216.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

Reading git-diff-tree failed