]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
projects / karo-tx-uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 94c1a20) | patch
spi: Fix merge conflicts - Makefile
authorMichal Simek <monstr@monstr.eu>
Fri, 3 Aug 2012 03:37:44 +0000 (03:37 +0000)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Aug 2012 21:08:14 +0000 (23:08 +0200)
commit968766a7e81e76c94d6cc485d7cd435fee885b83
tree5ef48e15b6266874d7f8a062bed969784c49377etree | snapshot
parent94c1a20fe78c0d3ba44ee8674b91163dddad0d80commit | diff
spi: Fix merge conflicts - Makefile

The patch "spi: tegra2: rename tegra2_spi.* to tegra_spi.*"
(sha1: edffa63d3d6e76991998789f9fcbaa483731ca65)
renamed tegra2_spi.c to tegra_spi.c

and the patch "Merge branch 'master' of git://git.denx.de/u-boot-microblaze"
(sha1: d978780b2e676c005460cd561f4f15b5220bdf49)

has wrongly resolved confict.

This patch fix it.

Signed-off-by: Michal Simek <monstr@monstr.eu>
drivers/spi/Makefile diff | blob | history
UBoot for KaRo TX COM modules