git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93dbb29 7c9017e)
Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Mon, 27 Jun 2011 02:12:00 +0000 (19:12 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 27 Jun 2011 02:12:00 +0000 (19:12 -0700)
1  2 
drivers/gpu/drm/i915/i915_drv.h patch | diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge
diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge
Pandora Kernel Repository