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

Makefile

board/samsung/common/multi_i2c.c

board/samsung/trats2/Makefile

board/samsung/trats2/trats2.c

boards.cfg

drivers/power/battery/Makefile

drivers/power/battery/bat_trats2.c

drivers/power/mfd/Makefile

drivers/power/mfd/fg_max77693.c

drivers/power/mfd/muic_max77693.c

drivers/power/mfd/pmic_max77693.c

include/configs/trats2.h

include/power/max77693_fg.h

include/power/max77693_muic.h

include/power/max77693_pmic.h