Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 2 Oct 2013 12:53:27 +0000 (14:53 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 2 Oct 2013 12:53:27 +0000 (14:53 +0200)
commitf04c53762962280365005c9db12ab561a18f2692
tree6cd2fa04929473afda1cceaa297cd340792bd326
parent5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4
parentce7a7f5e6bda35d7d0972be07b6983552d1a2cb2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'