diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-20 11:08:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-20 11:09:10 +1000 |
| commit | e84c20aff1ce7493bce26b75f1db363bb3f05979 (patch) | |
| tree | a04e109899142ce637b182f103cc9bfbdec18d1b /include/drm | |
| parent | 5a08c07526e9586318c5b57fd90af4350f83e26e (diff) | |
| download | linux-e84c20aff1ce7493bce26b75f1db363bb3f05979.tar.bz2 | |
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>
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions