Merge branch 'cpus4096' into irq/threaded