smdk4412: bulk update from i9300 update 9

Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into kbc-cyanogen-cm-10.1

Conflicts:
	drivers/battery/max77693_charger.c
	drivers/mmc/card/block.c