]> code.ossystems Code Review - bsp/u-boot.git/commitdiff
Code Review / bsp / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 3d74bd3 297facc)
Merge remote-tracking branch 'origin/master' into 2015.10+fslc
authorOtavio Salvador <otavio@ossystems.com.br>
Tue, 13 Oct 2015 18:12:26 +0000 (15:12 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 13 Oct 2015 18:12:26 +0000 (15:12 -0300)
* origin/master:
  ls102xa: Fix reset hang
  imx_watchdog: Add a header file for watchdog registers


Trivial merge
U-Boot repository with O.S. Systems patches and backports