| commit | 46eb72e01182c53547f251b79bc0204d16748879 | [log] [tgz] |
|---|---|---|
| author | Michal Simek <monstr@monstr.eu> | Fri Aug 03 03:37:44 2012 +0000 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Aug 07 23:08:14 2012 +0200 |
| tree | 5ef48e15b6266874d7f8a062bed969784c49377e | |
| parent | 6a600ceb7523c620e5d6b4408218470c19aca16f [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>