Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 14 Apr 2013 09:45:06 +0000 (11:45 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 14 Apr 2013 09:45:06 +0000 (11:45 +0200)
commit345be0b26734c560e8b33531ab21a1272179c5c3
tree37e5bfbf208bde4d41c20537a953e17ae0b078a2
parent8dc16cf9dd6196d99969d12741df186a61a2f9a3
parent9b74dc56fba2b9db39420f81c990284f36d5801f
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'