kernel: merge r24272