| commit | 867ced7d93d98ba5672da82a947a223ee5ac2fa3 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Fri May 16 17:56:50 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Fri May 16 17:56:50 2014 +0200 |
| tree | 0c105d2974cac3eb1767b61d01d2bedf29a2ab46 | |
| parent | 86b82ebbd139fe57f765f3fabe1bc025d1904949 [diff] | |
| parent | c39758a1b3c5c2ecd3357e3d127b2eca330e32fc [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'