Merge branch 'printk-cleanups'