From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 7 Mar 2011 10:18:55 +0000 (+0200)
Subject: ARM: imx/mx25: fix (again) spi device registration typo
X-Git-Tag: v2.6.39-rc1~434^2~5^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cba57eb7d55923b74ed8c7d1dd97ecf98b7bba77;p=pandora-kernel.git

ARM: imx/mx25: fix (again) spi device registration typo

This typo was fixed in 46e3f30 (mx25: fix spi device registration typo), but a
the merge at 0e44e059 (Merge commit 'v2.6.37-rc4' into imx-for-2.6.38) resolved
the merge conflict wrongly.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

Reading git-diff-tree failed