| commit | edd344778afb95cdcc181f023742de30696b42f8 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jun 30 23:00:34 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jun 30 23:00:34 2014 +0200 |
| tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc | |
| parent | de3d6d48c8e3b4861a148ad7f6c356e336269a10 [diff] | |
| parent | 12e2596769530b1302d2bdf5f8919343dc44d32d [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'