Merge by hand (conflicts between pending drivers and kfree cleanups)