diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 16:26:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 16:26:09 -0800 |
| commit | 8310509252c51e2a0e9effb50fefe7e098a67868 (patch) | |
| tree | f46a109ecc3b266ff4e7d61ddbf1896fa4202597 /include/linux/if_pppox.h | |
| parent | 09c50b4a52c01a1f450b8eec819089e228655bfb (diff) | |
| parent | 5004417d840e6dcb0052061fd04569b9c9f037a8 (diff) | |
| download | op-kernel-dev-8310509252c51e2a0e9effb50fefe7e098a67868.zip op-kernel-dev-8310509252c51e2a0e9effb50fefe7e098a67868.tar.gz | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Add missing mutex_lock(&dev->struct_mutex)
drm/i915: fix WC mapping in non-GEM i915 code.
drm/i915: Fix regression in 95ca9d
drm/i915: Retire requests from i915_gem_busy_ioctl.
drm/i915: suspend/resume GEM when KMS is active
drm/i915: Don't let a device flush to prepare buffers clear new write_domains.
drm/i915: Cut two args to set_to_gpu_domain that confused this tricky path.
Diffstat (limited to 'include/linux/if_pppox.h')
0 files changed, 0 insertions, 0 deletions
