summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-06 13:24:23 -0400
committerTom Rini <trini@konsulko.com>2016-06-06 13:39:43 -0400
commitd77fa2ff766bbb4b867e791187f78b6033071613 (patch)
treeb1116470884e46c0a66c49525771cf9b49c3835d /Makefile
parent65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff)
parent086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff)
downloadu-boot-imx-d77fa2ff766bbb4b867e791187f78b6033071613.zip
u-boot-imx-d77fa2ff766bbb4b867e791187f78b6033071613.tar.gz
u-boot-imx-d77fa2ff766bbb4b867e791187f78b6033071613.tar.bz2
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/peach-pi_defconfig configs/peach-pit_defconfig
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions