merging n5110 into kernel- kona