diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 18:48:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 18:48:11 -0700 |
| commit | 97e0214044d9f279a3d6286c9f859696ef0b7ebe (patch) | |
| tree | 628d2b834ab581f6db54367baddee4f86112d22c /arch/sh/mm/pmb.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | drm/i915: fix page flip finish vs. prepare on plane B (diff) | |
| download | linux-dev-97e0214044d9f279a3d6286c9f859696ef0b7ebe.tar.xz linux-dev-97e0214044d9f279a3d6286c9f859696ef0b7ebe.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: fix page flip finish vs. prepare on plane B
drm/i915: change default panel fitting mode to preserve aspect ratio
drm/i915: fix uninitialized variable warning in i915_setup_compression()
drm/i915: take struct_mutex in i915_dma_cleanup()
drm/i915: Fix CRT hotplug regression in 2.6.35-rc1
i915: fix ironlake edp panel setup (v4)
drm/i915: don't access FW_BLC_SELF on 965G
drm/i915: Account for space on the ring buffer consumed whilst wrapping.
drm/i915: gen3 page flipping fixes
drm/i915: don't queue flips during a flip pending event
drm/i915: Fix incorrect intel_ring_begin size in BSD ringbuffer.
drm/i915: Turn on 945 self-refresh only if single CRTC is active
drm/i915/gen4: Fix interrupt setup ordering
drm/i915: Use RSEN instead of HTPLG for tfp410 monitor detection.
drm/i915: Move non-phys cursors into the GTT
Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."
(Included the "fix page flip finish vs. prepare on plane B" patch from
Jesse on top of the pull request from Eric. -- Linus)
Diffstat (limited to 'arch/sh/mm/pmb.c')
0 files changed, 0 insertions, 0 deletions