Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc common/Makefile
Simple merge

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

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

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

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

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

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

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