[U-Boot] [PATCH] spi: Fix merge conflicts - Makefile

[Wolfgang Denk]

Dear Michal Simek,

In message <1344001064-762-1-git-send-email-monstr at monstr.eu> you wrote:
> 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 at monstr.eu>
> ---
>  drivers/spi/Makefile |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
He is truly wise who gains wisdom from another's mishap.