Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update