Merge branch 'master' into next

Conflicts:
	board/esd/plu405/plu405.c
	drivers/rtc/ftrtc010.c

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc MAINTAINERS
Simple merge

diff --cc board/esd/plu405/plu405.c
Simple merge

diff --cc common/Makefile
Simple merge

diff --cc common/cmd_bootm.c
Simple merge

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

diff --cc include/image.h
Simple merge

diff --cc lib_generic/Makefile
Simple merge

diff --cc mkconfig
Simple merge