| commit | 5f1f8efec7178a3096b4deb2fed4d2cbd0e2186e | [log] [tgz] |
|---|---|---|
| author | Stefano Babic <sbabic@denx.de> | Fri Apr 04 11:35:30 2014 +0200 |
| committer | Stefano Babic <sbabic@denx.de> | Fri Apr 04 11:35:30 2014 +0200 |
| tree | 34e035df5db9b327aeae36eff9d0645a915e3177 | |
| parent | bd23a6cc04d5e59b777730e8cff0abfb7dd78500 [diff] | |
| parent | d18a745390fa601aa2f2140f4da1e2df1f0fa68c [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm into master Conflicts: arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>