Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

diff --cc Makefile
Simple merge

diff --cc board/zeus/zeus.c
Simple merge

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

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

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

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