git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83bc5fd 84a1caf)
Merge tag 'v3.5-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 20 Jul 2012 04:53:28 +0000 (00:53 -0400)
committerDave Airlie <airlied@redhat.com>
Fri, 20 Jul 2012 04:53:28 +0000 (00:53 -0400)
Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c


Trivial merge
Pandora Kernel Repository