Merge 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 14 Jan 2014 10:50:54 +0000 (11:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 14 Jan 2014 10:50:54 +0000 (11:50 +0100)
commite6fe4bd989b93b1f37a25771fc14478dd33aa0df
tree58943761873a212fa7d7547e5220b16d67fb5daa
parentb02bfc4dfcef3be8276521e1933573e97a5cf203
parenta6bbee66197759f790de83181924bf1d2cf482b2
Merge 'u-boot-imx/master' into 'u-boot-arm/master'