summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDave Airlie2010-10-06 03:10:48 +0200
committerDave Airlie2010-10-06 03:10:48 +0200
commitfb7ba2114bcd8bb51640c20bc68f89164b29b9ed (patch)
tree80b4a779130a477680a72109257fb8c19d66cf22 /MAINTAINERS
parentMerge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next (diff)
parentvmwgfx: Fix fb VRAM pinning failure due to fragmentation (diff)
downloadkernel-qcow2-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.tar.gz
kernel-qcow2-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.tar.xz
kernel-qcow2-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.zip
Merge remote branch 'korg/drm-fixes' into drm-vmware-next
necessary for some of the vmware fixes to be pushed in. Conflicts: drivers/gpu/drm/drm_gem.c drivers/gpu/drm/i915/intel_fb.c include/drm/drmP.h
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 534f4d0accb9..5e1169df8c1f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2677,6 +2677,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com>
L: lm-sensors@lm-sensors.org
W: http://www.lm-sensors.org/
T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
+T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
S: Maintained
F: Documentation/hwmon/
F: drivers/hwmon/