[U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master

[Albert ARIBAUD]

Hi Tom,

> Just confirmed - in tegra20_sflash.c, remove the <<<<< HEAD section (#ifdef
> CONFIG_OF_CONTROL + 2 lines), and keep the "tegra: spi remove non fdt
> support" section (spi->slave.bus = bus + 4 lines).

Ok, thanks a lot for confirming. I'll do the merge (and tests)
accordingly on u-boot-arm and then send out my PR to The Other
Tom.

Amicalement,
-- 
Albert.