git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41f13fe 07d43ba)
drm: merge Linux master into HEAD
authorDave Airlie <airlied@redhat.com>
Sun, 29 Mar 2009 00:22:18 +0000 (20:22 -0400)
committerDave Airlie <airlied@redhat.com>
Sun, 29 Mar 2009 00:22:18 +0000 (20:22 -0400)
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c


Trivial merge
Pandora Kernel Repository