Merge branch 'merge' into next

We want the irq fixes from the "merge" branch.