diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-08 12:42:35 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-08 12:42:35 +0400 |
commit | 6cf98d6ebb37a183d92c4183dc228cdeef9a7083 (patch) | |
tree | a37584328f0e1df87db9b1c8662655a2e8891a43 /arch/sparc/include/asm/machines.h | |
parent | 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5 (diff) | |
parent | 23e81d691a813839020f6e516b398d0f9369fe8b (diff) | |
download | linux-6cf98d6ebb37a183d92c4183dc228cdeef9a7083.tar.xz |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
char/agp: add another Ironlake host bridge
drm/i915: fix up ivb plane 3 pageflips
drm/i915: hold forcewake around ring hw init
drm/i915: Mark the ringbuffers as being in the GTT domain
drm/i915/crt: Do not rely upon the HPD presence pin
drm/i915: Reset last_retired_head when resetting ring
Diffstat (limited to 'arch/sparc/include/asm/machines.h')
0 files changed, 0 insertions, 0 deletions