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)
1  2 
common/board_f.c
include/configs/mx35pdk.h

Simple merge
Simple merge