Unverified Commit 79eb3cbf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm32-dt-for-5.14' of git://github.com/hisilicon/linux-hisi into arm/dt

ARM: DT: HiSilicon ARM32 DT updates for 5.14

- Correct the HiSilicon copyright

* tag 'hisi-arm32-dt-for-5.14' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: hisilicon: use the correct HiSilicon copyright

Link: https://lore.kernel.org/r/60CBF408.7040302@hisilicon.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9be38993 da1eab9e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Hisilicon Ltd. Hi3620 SoC
 * HiSilicon Ltd. Hi3620 SoC
 *
 * Copyright (C) 2012-2013 Hisilicon Ltd.
 * Copyright (C) 2012-2013 HiSilicon Ltd.
 * Copyright (C) 2012-2013 Linaro Ltd.
 *
 * Author: Haojian Zhuang <haojian.zhuang@linaro.org>
+2 −2
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Hisilicon Ltd. HiP01 SoC
 * HiSilicon Ltd. HiP01 SoC
 *
 * Copyright (C) 2014 Hisilicon Ltd.
 * Copyright (C) 2014 HiSilicon Ltd.
 * Copyright (C) 2014 Huawei Ltd.
 *
 * Author: Wang Long <long.wanglong@huawei.com>
+2 −2
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Hisilicon Ltd. HiP01 SoC
 * HiSilicon Ltd. HiP01 SoC
 *
 * Copyright (c) 2014 Hisilicon Ltd.
 * Copyright (c) 2014 HiSilicon Ltd.
 * Copyright (c) 2014 Huawei Ltd.
 *
 * Author: Wang Long <long.wanglong@huawei.com>
+2 −2
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Hisilicon Ltd. HiP04 SoC
 * HiSilicon Ltd. HiP04 SoC
 *
 * Copyright (C) 2013-2014 Hisilicon Ltd.
 * Copyright (C) 2013-2014 HiSilicon Ltd.
 * Copyright (C) 2013-2014 Linaro Ltd.
 *
 * Author: Haojian Zhuang <haojian.zhuang@linaro.org>
+1 −1
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Copyright (c) 2013-2014 Linaro Ltd.
 * Copyright (c) 2013-2014 Hisilicon Limited.
 * Copyright (c) 2013-2014 HiSilicon Limited.
 */

/dts-v1/;
Loading