From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 13 Oct 2015 18:12:26 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/master' into 2015.10+fslc
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=23bf08cd7da753ef54e1c7267648b8dd725c543e;p=bsp%2Fu-boot.git

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
---

23bf08cd7da753ef54e1c7267648b8dd725c543e