mirror of
https://github.com/torvalds/linux
synced 2024-10-27 05:39:25 +00:00
3ff99164f6
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 |
||
---|---|---|
.. | ||
drm | ||
vga | ||
Makefile |