smdk4412: bulk update from i9300 update 9 - #2

Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296

Conflicts:

	drivers/battery/max77693_charger.c
	drivers/mmc/core/mmc.c