diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 12:56:35 +0300 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 12:56:35 +0300 | 
| commit | f7b6a8b30cedaa64ba18d80f1fb3404274281639 (patch) | |
| tree | 13937ba94eed328bb19b1ccf343cca35446b878b /include/linux/iio/timer/stm32-timer-trigger.h | |
| parent | b33fb3cf6f5e039dea4a85a708a2c86f8a323575 (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | linux-f7b6a8b30cedaa64ba18d80f1fb3404274281639.tar.xz | |
Merge tag 'v5.2-rc3' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/iio/timer/stm32-timer-trigger.h')
| -rw-r--r-- | include/linux/iio/timer/stm32-timer-trigger.h | 3 | 
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/iio/timer/stm32-timer-trigger.h b/include/linux/iio/timer/stm32-timer-trigger.h index cbb7c7ae6c0c..37572e4dc73a 100644 --- a/include/linux/iio/timer/stm32-timer-trigger.h +++ b/include/linux/iio/timer/stm32-timer-trigger.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */  /*   * Copyright (C) STMicroelectronics 2016   *   * Author: Benjamin Gaignard <benjamin.gaignard@st.com> - * - * License terms:  GNU General Public License (GPL), version 2   */  #ifndef _STM32_TIMER_TRIGGER_H_  | 
