diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:38:59 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:39:08 +0200 |
commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /arch/arm/boot/dts/usb_a9260_common.dtsi | |
parent | cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff) | |
parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'arch/arm/boot/dts/usb_a9260_common.dtsi')
-rw-r--r-- | arch/arm/boot/dts/usb_a9260_common.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/usb_a9260_common.dtsi b/arch/arm/boot/dts/usb_a9260_common.dtsi index de3fa3ab34d6..8744b5f6f792 100644 --- a/arch/arm/boot/dts/usb_a9260_common.dtsi +++ b/arch/arm/boot/dts/usb_a9260_common.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb_a926x.dts - Device Tree file for Caloa USB A926x board * * Copyright (C) 2011-2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> - * - * Licensed under GPLv2 or later. */ / { |