projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f77309d 11bd5e7)
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Wed, 1 Feb 2017 21:34:25 +0000 (16:34 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 1 Feb 2017 21:34:25 +0000 (16:34 -0500)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.