summaryrefslogtreecommitdiff
path: root/arch/nds32/cpu
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-10 10:41:54 -0500
committerTom Rini <trini@ti.com>2015-02-10 10:41:54 -0500
commit0dac731d1932027f4f813ec7aede35d5e30dec0e (patch)
tree522a20ea29730f0b5be03c8ced3b16a37fc165fe /arch/nds32/cpu
parent307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff)
parent7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff)
downloadu-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.zip
u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.gz
u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/nds32/cpu')
0 files changed, 0 insertions, 0 deletions