forked from Minki/linux
7f16e5c141
I want to merge in the new Broadwell support as a late hw enabling pull request. But since the internal branch was based upon our drm-intel-nightly integration branch I need to resolve all the oustanding conflicts in drm/i915 with a backmerge to make the 60+ patches apply properly. We'll propably have some fun because Linus will come up with a slightly different merge solution. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_crt.c drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_drv.h All rather simple adjacent lines changed or partial backports from -next to -fixes, with the exception of the thaw code in i915_dma.c. That one needed a bit of shuffling to restore the intent. Oh and the massive header file reordering in intel_drv.h is a bit trouble. But not much. v2: Also don't forget the fixup for the silent conflict that results in compile fail ... Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
||
|---|---|---|
| .. | ||
| android | ||
| bcm | ||
| btmtk_usb | ||
| ced1401 | ||
| comedi | ||
| cptm1217 | ||
| crystalhd | ||
| cxt1e1 | ||
| dgap | ||
| dgnc | ||
| dgrp | ||
| dwc2 | ||
| echo | ||
| et131x | ||
| frontier | ||
| ft1000 | ||
| fwserial | ||
| gdm72xx | ||
| gdm724x | ||
| goldfish | ||
| iio | ||
| imx-drm | ||
| keucr | ||
| line6 | ||
| lustre | ||
| media | ||
| netlogic | ||
| nvec | ||
| octeon | ||
| octeon-usb | ||
| olpc_dcon | ||
| ozwpan | ||
| panel | ||
| phison | ||
| quickstart | ||
| rtl8187se | ||
| rtl8188eu | ||
| rtl8192e | ||
| rtl8192u | ||
| rtl8712 | ||
| rts5139 | ||
| sb105x | ||
| sbe-2t3e3 | ||
| sep | ||
| serqt_usb2 | ||
| silicom | ||
| slicoss | ||
| sm7xxfb | ||
| speakup | ||
| ste_rmi4 | ||
| tidspbridge | ||
| usbip | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| winbond | ||
| wlags49_h2 | ||
| wlags49_h25 | ||
| wlan-ng | ||
| xgifb | ||
| xillybus | ||
| zram | ||
| zsmalloc | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||