Searched hist:edffa63d3d6e76991998789f9fcbaa483731ca65 (Results 1 – 2 of 2) sorted by relevance
| /rk3399_rockchip-uboot/drivers/spi/ |
| H A D | Makefile | 968766a7e81e76c94d6cc485d7cd435fee885b83 Fri Aug 03 03:37:44 UTC 2012 Michal Simek <monstr@monstr.eu> 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>
edffa63d3d6e76991998789f9fcbaa483731ca65 Tue May 22 07:33:47 UTC 2012 Tom Warren <twarren.nvidia@gmail.com> spi: tegra2: rename tegra2_spi.* to tegra_spi.*
In anticipation of Tegra3 support, start removing/renaming
Tegra2-specific files. No functional changes (yet).
Also updated copyright to 2012.
Signed-off-by: Tom Warren <twarren@nvidia.com>
|
| /rk3399_rockchip-uboot/include/configs/ |
| H A D | seaboard.h | edffa63d3d6e76991998789f9fcbaa483731ca65 Tue May 22 07:33:47 UTC 2012 Tom Warren <twarren.nvidia@gmail.com> spi: tegra2: rename tegra2_spi.* to tegra_spi.*
In anticipation of Tegra3 support, start removing/renaming
Tegra2-specific files. No functional changes (yet).
Also updated copyright to 2012.
Signed-off-by: Tom Warren <twarren@nvidia.com>
|