removed Diablo Kernel Conflicting files
Merge branch 'TheMuppets/cm-10.2'
removed for Diablo Kernel
Merge branch 'TheMuppets/cm-10.2'
Merge branch 'TheMuppets/cm-10.2'
Merge branch 'thdDude/cm-10.2'