diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
| commit | f0718d792b8a6d4b5ddc929e418ac57cc4897375 (patch) | |
| tree | 3dbaa824ce380e99709fae47c047383ca39c983a /include/dt-bindings/interrupt-controller/irq.h | |
| parent | efe8eaf7b525f1be26fe20d723d2bfbfcd7455fd (diff) | |
| parent | b59dfdaef173677b0b7e10f375226c0a1114fd20 (diff) | |
| download | talos-op-linux-f0718d792b8a6d4b5ddc929e418ac57cc4897375.tar.gz talos-op-linux-f0718d792b8a6d4b5ddc929e418ac57cc4897375.zip | |
Merge branch 'linus' into perf/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/dt-bindings/interrupt-controller/irq.h')
| -rw-r--r-- | include/dt-bindings/interrupt-controller/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/interrupt-controller/irq.h b/include/dt-bindings/interrupt-controller/irq.h index a8b310555f14..9e3d183e1381 100644 --- a/include/dt-bindings/interrupt-controller/irq.h +++ b/include/dt-bindings/interrupt-controller/irq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ /* * This header provides constants for most IRQ bindings. * |
