diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 15:42:25 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 15:42:25 +0200 |
| commit | d7929c1e13e3788e7cb741d75b5baec5e53eff21 (patch) | |
| tree | cf513071edfc4499b4e025e4846244c9d0e4c6bd /drivers/scsi/megaraid/mega_common.h | |
| parent | drm/amdgpu: disable gfxoff on navi10 (diff) | |
| parent | drm/edid: use for_each_displayid_db where applicable (diff) | |
| download | linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.tar.xz linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.zip | |
Merge branch 'drm-next' into drm-next-5.3
Backmerge drm-next and fix up conflicts due to drmP.h removal.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/scsi/megaraid/mega_common.h')
| -rw-r--r-- | drivers/scsi/megaraid/mega_common.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h index 1d037ed52c33..3a7596e47a88 100644 --- a/drivers/scsi/megaraid/mega_common.h +++ b/drivers/scsi/megaraid/mega_common.h @@ -1,14 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * Linux MegaRAID device driver * * Copyright (c) 2003-2004 LSI Logic Corporation. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * * FILE : mega_common.h * * Libaray of common routine used by all low-level megaraid drivers |