diff options
| author | Greg Kroah-Hartman | 2019-01-28 08:44:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-28 08:44:58 +0100 |
| commit | c9381e185fdcf86e9d7966d638c933894f87cdd7 (patch) | |
| tree | d99259aded85a3fb95e9d52c56d9d3a0cfdfe460 /include/dt-bindings/reset/amlogic,meson-axg-reset.h | |
| parent | usb: ftdi-elan: Fix if == else warnings in ftdi_elan_respond_engine (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | kernel-qcow2-linux-c9381e185fdcf86e9d7966d638c933894f87cdd7.tar.gz kernel-qcow2-linux-c9381e185fdcf86e9d7966d638c933894f87cdd7.tar.xz kernel-qcow2-linux-c9381e185fdcf86e9d7966d638c933894f87cdd7.zip | |
Merge 5.0-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/dt-bindings/reset/amlogic,meson-axg-reset.h')
| -rw-r--r-- | include/dt-bindings/reset/amlogic,meson-axg-reset.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/dt-bindings/reset/amlogic,meson-axg-reset.h b/include/dt-bindings/reset/amlogic,meson-axg-reset.h index ad6f55dabd6d..0f2e0fe45ca4 100644 --- a/include/dt-bindings/reset/amlogic,meson-axg-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-axg-reset.h @@ -1,12 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ /* - * * Copyright (c) 2016 BayLibre, SAS. * Author: Neil Armstrong <narmstrong@baylibre.com> * * Copyright (c) 2017 Amlogic, inc. * Author: Yixun Lan <yixun.lan@amlogic.com> * - * SPDX-License-Identifier: (GPL-2.0+ OR BSD) */ #ifndef _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H |