diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2016-10-27 20:24:19 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-28 18:56:17 +0100 |
| commit | e3cd6cf425bf40061418edf7b295f654301446fe (patch) | |
| tree | 9a750a8da892ba70d8277bd1ab1151da818817d2 /tools/perf/util/scripting-engines/trace-event-python.c | |
| 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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions