diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:06:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:06:40 -0400 |
| commit | 98b98d316349e9a028e632629fe813d07fa5afdd (patch) | |
| tree | caaf6a662a86c5e2a418f0929ca05f0748803ac5 /MAINTAINERS | |
| parent | 0d66cba1ac3ad38614077443d604d6a09cec99de (diff) | |
| parent | 931474c4c30633400ff0dff8fb452ae20e01d067 (diff) | |
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)
drivers/gpu/drm/radeon/atom.c: fix warning
drm/radeon/kms: bump kms version number
drm/radeon/kms: properly set num banks for fusion asics
drm/radeon/kms/atom: move dig phy init out of modesetting
drm/radeon/kms/cayman: fix typo in register mask
drm/radeon/kms: fix typo in spread spectrum code
drm/radeon/kms: fix tile_config value reported to userspace on cayman.
drm/radeon/kms: fix incorrect comparison in cayman setup code.
drm/radeon/kms: add wait idle ioctl for eg->cayman
drm/radeon/cayman: setup hdp to invalidate and flush when asked
drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked
agp/uninorth: Fix lockups with radeon KMS and >1x.
drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only
drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices
drm/radeon/kms: fixup eDP connector handling
drm/radeon/kms: bail early for eDP in hotplug callback
drm/radeon/kms: simplify hotplug handler logic
drm/radeon/kms: rewrite DP handling
drm/radeon/kms/atom: add support for setting DP panel mode
drm/radeon/kms: atombios.h updates for DP panel mode
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0b415248ae25..b64825ddaf32 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2245,10 +2245,10 @@ F: drivers/gpu/drm/ | |||
| 2245 | F: include/drm/ | 2245 | F: include/drm/ |
| 2246 | 2246 | ||
| 2247 | INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) | 2247 | INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) |
| 2248 | M: Chris Wilson <chris@chris-wilson.co.uk> | 2248 | M: Keith Packard <keithp@keithp.com> |
| 2249 | L: intel-gfx@lists.freedesktop.org (subscribers-only) | 2249 | L: intel-gfx@lists.freedesktop.org (subscribers-only) |
| 2250 | L: dri-devel@lists.freedesktop.org | 2250 | L: dri-devel@lists.freedesktop.org |
| 2251 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git | 2251 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git |
| 2252 | S: Supported | 2252 | S: Supported |
| 2253 | F: drivers/gpu/drm/i915 | 2253 | F: drivers/gpu/drm/i915 |
| 2254 | F: include/drm/i915* | 2254 | F: include/drm/i915* |