Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
commita538ae997ae4cb375ba5362b50ba3f5b35f9519b
tree3f709a9137f1af222c125e17a0075290dfe740f8
parent8c8dc4c61518124eb35f4dd9d8466378ba247e9c
parentd5eb6dcf44f5c889dd80c81cf3b06385a27f8baf
Merge branch 'master' of git://denx.de/git/u-boot-imx
common/board_f.c
include/configs/mx35pdk.h