Patching some mainline Kernel files that had differences.