Merge with git://www.denx.de/git/u-boot.git

diff --cc board/amcc/sequoia/sequoia.c
Simple merge

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

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

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

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

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

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

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

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

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

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