Adjust some patches to avoid patching the ChangeLog which isn't quite the same. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>