| commit | e3cd6cf425bf40061418edf7b295f654301446fe | [log] [tgz] |
|---|---|---|
| author | Heiner Kallweit <hkallweit1@gmail.com> | Thu Oct 27 20:24:19 2016 +0200 |
| committer | Mark Brown <broonie@kernel.org> | Fri Oct 28 18:56:17 2016 +0100 |
| tree | 9a750a8da892ba70d8277bd1ab1151da818817d2 | |
| parent | f9ce28f92385622070f398660e7b2066f02997c8 [diff] |
spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"
Commit 5c0ba57744b1 ("spi: fsl-espi: avoid processing uninitalized
data on error") applied fine to stable but caused a merge conflict
on next. This patch fixes that.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>