]> code.ossystems Code Review - bsp/u-boot.git/commit
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)
commit23bf08cd7da753ef54e1c7267648b8dd725c543e
treee11c149efab034d34eae47439d60809231c6ac2e
parent3d74bd31e37b3dc3dc9e5411ee587cdb3e32c51a
parent297faccca2235e359012118495b9b73451d54bb9
Merge remote-tracking branch 'origin/master' into 2015.10+fslc

* origin/master:
  ls102xa: Fix reset hang
  imx_watchdog: Add a header file for watchdog registers