Completed merge of the kernels file