Intelli_plug part 2
Update Makefile
Merge branch 'icecodekk' of https://github.com/javelinanddart/android_kernel_htc_ville into icecodekk