Merge git://git.denx.de/u-boot-samsung

diff --cc configs/arndale_defconfig
Simple merge

diff --cc configs/peach-pi_defconfig
Simple merge

diff --cc configs/peach-pit_defconfig
Simple merge

diff --cc configs/s5pc210_universal_defconfig
Simple merge

diff --cc configs/smdk5250_defconfig
Simple merge

diff --cc configs/snow_defconfig
Simple merge

diff --cc configs/spring_defconfig
Simple merge