diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-06-19 13:04:55 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-06-19 13:07:29 +0300 |
| commit | 52d2d44eee8091e740d0d275df1311fb8373c9a9 (patch) | |
| tree | 4aff282e84b3469f18cf9717490b892f6f39198f /drivers/eisa | |
| parent | 2454fcea338ad821a39d471bc7db5a58ba41b742 (diff) | |
| parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
| download | linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.xz | |
Merge v5.2-rc5 into drm-next
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier
removal topic branch into drm-misc-next.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/eisa')
| -rw-r--r-- | drivers/eisa/eisa-bus.c | 3 | ||||
| -rw-r--r-- | drivers/eisa/pci_eisa.c | 3 | ||||
| -rw-r--r-- | drivers/eisa/virtual_root.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index 1e8062f6dbfc..d9a16ba2ccc2 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * EISA bus support functions for sysfs. * * (C) 2002, 2003 Marc Zyngier <maz@wild-wind.fr.eu.org> - * - * This code is released under the GPL version 2. */ #include <linux/kernel.h> diff --git a/drivers/eisa/pci_eisa.c b/drivers/eisa/pci_eisa.c index b5f367b44413..930c2332c3c4 100644 --- a/drivers/eisa/pci_eisa.c +++ b/drivers/eisa/pci_eisa.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Minimalist driver for a generic PCI-to-EISA bridge. * * (C) 2003 Marc Zyngier <maz@wild-wind.fr.eu.org> * - * This code is released under the GPL version 2. - * * Ivan Kokshaysky <ink@jurassic.park.msu.ru> : * Generalisation from i82375 to PCI_CLASS_BRIDGE_EISA. */ diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c index f1221c1d6319..37e6dd219c37 100644 --- a/drivers/eisa/virtual_root.c +++ b/drivers/eisa/virtual_root.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Virtual EISA root driver. * Acts as a placeholder if we don't have a proper EISA bridge. * * (C) 2003 Marc Zyngier <maz@wild-wind.fr.eu.org> - * - * This code is released under the GPL version 2. */ #include <linux/kernel.h> |