git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 164f7b5)
ARM: imx/mx25: fix (again) spi device registration typo
authorBaruch Siach <baruch@tkos.co.il>
Mon, 7 Mar 2011 10:18:55 +0000 (12:18 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 8 Mar 2011 12:24:23 +0000 (13:24 +0100)
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>

No differences found
Pandora Kernel Repository