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

diff --cc README
Simple merge

diff --cc common/board_f.c
Simple merge

diff --cc configs/apx4devkit_defconfig
Simple merge

diff --cc configs/gplugd_defconfig
Simple merge

diff --cc configs/m28evk_defconfig
Simple merge

diff --cc configs/mpc5121ads_defconfig
Simple merge

diff --cc configs/mpc5121ads_rev2_defconfig
Simple merge

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

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

diff --cc scripts/config_whitelist.txt
Simple merge