Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@ti.com>
Tue, 25 Nov 2014 21:51:47 +0000 (16:51 -0500)
committerTom Rini <trini@ti.com>
Wed, 26 Nov 2014 16:23:26 +0000 (11:23 -0500)
commit85bafb6da4dddfffa78479aa49a72ae48578a4ce
tree2f6ec138e922a89a6ec55ae1908cfbf0ddf2c953
parent21008ad6384170767041f1608975473c5ffa7fc7
parent0ab172353e14dbdb7278755de6feae3fc4b54c2f
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
board/freescale/common/sys_eeprom.c
board/freescale/ls1021aqds/ls1021aqds.c
board/freescale/ls1021atwr/ls1021atwr.c
drivers/Makefile
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h