diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-18 05:48:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-18 06:20:36 +0300 |
| commit | 13091aa30535b719e269f20a7bc34002bf5afae5 (patch) | |
| tree | bd17956c3ce606a119fadbd43bfa1c0c10006984 /drivers/iio/proximity/srf08.c | |
| parent | f97252a8c33f0e02f4ffbf61dc94cd38164007bc (diff) | |
| parent | 29f785ff76b65696800b75c3d8e0b58e603bb1d0 (diff) | |
| download | linux-13091aa30535b719e269f20a7bc34002bf5afae5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/iio/proximity/srf08.c')
| -rw-r--r-- | drivers/iio/proximity/srf08.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index f2bf783f829a..b23ce446b7be 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * srf08.c - Support for Devantech SRFxx ultrasonic ranger * with i2c interface @@ -5,10 +6,6 @@ * * Copyright (c) 2016, 2017 Andreas Klinger <ak@it-klinger.de> * - * This file is subject to the terms and conditions of version 2 of - * the GNU General Public License. See the file COPYING in the main - * directory of this archive for more details. - * * For details about the device see: * http://www.robot-electronics.co.uk/htm/srf08tech.html * http://www.robot-electronics.co.uk/htm/srf10tech.htm |