Merge branch 'linus' into cont_syslog