diff options
| author | Linus Torvalds <[email protected]> | 2008-11-03 17:58:40 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-11-03 17:58:40 +0000 |
| commit | 30ef898c535bffd105c1a9b9b6563969b3deb31e (patch) | |
| tree | 5082ab8e5ea5abc0254c23a3733f1fb3822846a0 /net/unix/af_unix.c | |
| parent | Linux v2.6.28-rc3 (diff) | |
| parent | i915: Add GEM ioctl to get available aperture size. (diff) | |
| download | kernel-30ef898c535bffd105c1a9b9b6563969b3deb31e.tar.gz kernel-30ef898c535bffd105c1a9b9b6563969b3deb31e.zip | |
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
i915: Add GEM ioctl to get available aperture size.
drm/radeon: fixup further bus mastering confusion.
build fix: CONFIG_DRM_I915=y && CONFIG_ACPI=n
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions