]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - drivers/spi/spi-fsl-espi.c
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f9ce28f) | patch
spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data...
authorHeiner Kallweit <hkallweit1@gmail.com>
Thu, 27 Oct 2016 18:24:19 +0000 (20:24 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 28 Oct 2016 17:56:17 +0000 (18:56 +0100)
commite3cd6cf425bf40061418edf7b295f654301446fe
tree9a750a8da892ba70d8277bd1ab1151da818817d2tree
parentf9ce28f92385622070f398660e7b2066f02997c8commit | 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>
drivers/spi/spi-fsl-espi.c diff | blob | blame | history
Ubuntu Artful kernel mirror