Fixes some mess left overs from merges / reverts. now all as was.
Merge branch 'master-jelly-bean' of https://github.com/dorimanx/Dorimanx-SG2-I9100-Kernel into master-jelly-bean