diff options
author | Jani Nikula <jani.nikula@intel.com> | 2019-05-28 11:07:59 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2019-05-28 11:07:59 +0300 |
commit | 2491b544ff3aa9717d427033206fa793be53429d (patch) | |
tree | 71b5fc8897495a791519ece54c14f81484c48ae9 /drivers/iio/accel/kxsd9-spi.c | |
parent | b27e35ae5b1804078cfd177082429eea9de01885 (diff) | |
parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) |
Merge drm/drm-next into drm-intel-next-queued
Get the HDR dependencies originally merged via drm-misc. Sync up all
i915 changes applied via other trees. And get v5.2-rc2 as the baseline.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/iio/accel/kxsd9-spi.c')
-rw-r--r-- | drivers/iio/accel/kxsd9-spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c index b7d0078fd00e..011aeff19e3e 100644 --- a/drivers/iio/accel/kxsd9-spi.c +++ b/drivers/iio/accel/kxsd9-spi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/device.h> #include <linux/kernel.h> #include <linux/spi/spi.h> |