Merge branch 'caf-jb_2.0.3' of github.com:CyanCom/android_kernel_samsung_delos3geur into caf-jb_2.0.3

Change-Id: Id5d33532b8863b8d6c87972ce09b7ad7d64b32ab