git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bd049f f2b115e)
Merge remote branch 'anholt/drm-intel-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:03:47 +0000 (14:03 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:03:47 +0000 (14:03 +1000)
This merges the upstream Intel tree and fixes up numerous conflicts
due to patches merged into Linus tree later in -rc cycle.

Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/drm_dp_i2c_helper.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_suspend.c


Trivial merge
Pandora Kernel Repository