72b372
Revert "Merge branch 'kernel-git' strategy 'theirs'" This reverts commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf, reversing changes made to ee99a68c51ebd08409e45b63796f3c971c27e3d6.