| commit | 44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Sep 30 08:47:41 2015 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Sep 30 08:47:41 2015 +0200 |
| tree | ec97ee26c9715f8da24377e9cacc63261b0aa2ab | |
| parent | 40a4a5727f21a0e439d317aa99953e24467605eb [diff] | |
| parent | 2d4df13c0f9ef56452b1d9a9016cb3946e17bfe5 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Backmerge to catch up with 4.3. slightly more involved conflict in the irq code, but nothing beyond adjacent changes. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>