summaryrefslogtreecommitdiffstats
path: root/drivers/spi/Makefile
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-10-27 20:24:19 +0200
committerMark Brown <broonie@kernel.org>2016-10-28 19:56:17 +0200
commite3cd6cf425bf40061418edf7b295f654301446fe (patch)
tree9a750a8da892ba70d8277bd1ab1151da818817d2 /drivers/spi/Makefile
parentMerge branch 'fix/fsl-espi' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-e3cd6cf425bf40061418edf7b295f654301446fe.tar.xz
linux-e3cd6cf425bf40061418edf7b295f654301446fe.zip
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 'drivers/spi/Makefile')
0 files changed, 0 insertions, 0 deletions