]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c90c43c 277b133)
Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 1 Jun 2018 13:52:15 +0000 (09:52 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Jun 2018 13:52:15 +0000 (09:52 -0400)
1  2 
cmd/Kconfig patch | diff1 | diff2 | blob | history
scripts/config_whitelist.txt patch | diff1 | diff2 | blob | history

diff --cc cmd/Kconfig
Simple merge
diff --cc scripts/config_whitelist.txt
Simple merge
Cloned from git://git.denx.de/u-boot.git