Dave Airlie e84c20aff1 drm/radeon/kms: merge conflicted badly ... Not sure why git didn't flag this, but the result of automerge from 3.14-rc7 screwed up the radeon init procedure. Reported-by: Fireburn on #radeon Signed-off-by: Dave Airlie <airlied@redhat.com>		2014-03-20 11:09:10 +10:00
..
drm	drm/radeon/kms: merge conflicted badly	2014-03-20 11:09:10 +10:00
host1x	gpu: host1x: do not check previously handled gathers	2014-02-12 07:50:37 +01:00
vga	vgaarb: Fix VGA decodes changes	2013-09-03 19:17:59 +02:00
Makefile