Apply "GT-I8190_JB_Opensource_Update2" + conflicting fifes

from http://opensource.samsung.com/reception/receptionSub.do?method=search&searchValue=I8190

fusion of 2 commits
https://github.com/andi34/android_kernel_samsung_golden/commit/8471191c4e3be0d2b498b51c30712a2a05445fc5
https://github.com/andi34/android_kernel_samsung_golden/commit/b8c0a044bc487dfb9dcbec1c3023c1d9c75871f0