Merge branch 'net-merge' of https://github.com/StanTRC/Dorimanx-SG2-I9100-Kernel into master-maliv3
Merge branch 'master-jelly-cm-aokp' of https://github.com/dorimanx/Dorimanx-SG2-I9100-Kernel into master-jelly-cm-aokp