summaryrefslogtreecommitdiff
path: root/include/bedbug
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-08-03 03:37:44 +0000
committerWolfgang Denk <wd@denx.de>2012-08-07 23:08:14 +0200
commit968766a7e81e76c94d6cc485d7cd435fee885b83 (patch)
tree5ef48e15b6266874d7f8a062bed969784c49377e /include/bedbug
parent94c1a20fe78c0d3ba44ee8674b91163dddad0d80 (diff)
downloadu-boot-imx-968766a7e81e76c94d6cc485d7cd435fee885b83.zip
u-boot-imx-968766a7e81e76c94d6cc485d7cd435fee885b83.tar.gz
u-boot-imx-968766a7e81e76c94d6cc485d7cd435fee885b83.tar.bz2
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>
Diffstat (limited to 'include/bedbug')
0 files changed, 0 insertions, 0 deletions