Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

diff --cc board/freescale/common/sys_eeprom.c
Simple merge

diff --cc board/freescale/ls1021aqds/ls1021aqds.c
Simple merge

diff --cc board/freescale/ls1021atwr/ls1021atwr.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc include/configs/ls1021aqds.h
Simple merge

diff --cc include/configs/ls1021atwr.h
Simple merge