Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@konsulko.com>
Fri, 6 Nov 2015 14:21:33 +0000 (09:21 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 6 Nov 2015 14:21:33 +0000 (09:21 -0500)
1  2 
common/board_f.c

Simple merge