Backmerge to catch up with 4.3. slightly more involved conflict in the
irq code, but nothing beyond adjacent changes.
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>