Merge commit 'a750f4ee10f962640c479aca184fe65f83956295' of git://people.freedesktop...

Signed-off-by: Kyle McMartin <kyle@kernel.org>

diff --cc WHENCE
index 75cb999c53036197212f47eed2d4a719be796867,de959c1f28f6aedf3f2cbcd5f5e1da6d46a451af..9accdf1a7b08b3c352786861d797e89ee4157b02
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -2778,45 -2759,23 +2778,69 @@@ Licence: Redistributable. See LICENCE.n
  
  --------------------------------------------------------------------------
  
++<<<<<<< HEAD
 +<<<<<<< HEAD
 +Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver
 +
 +File: atusb/atusb-0.2.dfu
 +Version: 0.2
 +Info: atusb/ChangeLog
 +
 +Licence: GPLv2+
 +
 +--------------------------------------------------------------------------
 +
 +Driver: qca - Qualcomm Atheros Bluetooth support for QCA61x4 chips
 +
 +File: qca/nvm_usb_00000201.bin
 +File: qca/nvm_usb_00000200.bin
 +File: qca/nvm_usb_00000300.bin
 +File: qca/nvm_usb_00000302.bin
 +File: qca/nvm_00130300.bin
 +File: qca/nvm_00130302.bin
 +File: qca/rampatch_usb_00000200.bin
 +File: qca/rampatch_usb_00000201.bin
 +File: qca/rampatch_usb_00000300.bin
 +File: qca/rampatch_usb_00000302.bin
 +File: qca/rampatch_00130300.bin
 +File: qca/rampatch_00130302.bin
 +
 +Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details
 +
 +--------------------------------------------------------------------------
 +
 +Driver: liquidio -- Cavium LiquidIO driver
 +
 +File: liquidio/lio_210nv_nic.bin
 +Version: v1.1.9
 +
 +File: liquidio/lio_210sv_nic.bin
 +Version: v1.1.9
 +
 +File: liquidio/lio_410nv_nic.bin
 +Version: v1.1.9
 +
 +Licence: Redistributable. See LICENCE.cavium for details
++
++--------------------------------------------------------------------------
++
+ Driver: i915 -- Intel Integrated Graphics driver
+ 
+ File: i915/skl_dmc_ver1_04.bin
+ File: i915/skl_dmc_ver1_16.bin
+ File: i915/skl_dmc_ver1_18.bin
+ 
+ File: i915/skl_dmc_ver1.bin
+ Version: DMC API/ABI ver 1 - release 18 for Skylake
+ 
+ File: i915/bxt_dmc_ver1_04.bin
+ 
+ File: i915/bxt_dmc_ver1.bin
+ Version: DMC API/ABI ver 1 - release 04 for Broxton
+ 
+ File: i915/skl_guc_ver1_1059.bin
+ 
+ File: i915/skl_guc_ver1.bin
+ Version: Guc API/ABI ver 1 - release 1059 for Skylake
+ 
+ License: Redistributable. See LICENSE.i915 for details