diff options
| author | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
| commit | a954e5fb4bc2d401b8fc3b4c7cd316497ff80225 (patch) | |
| tree | 06af23b232c7c2e795a2fef8a5a0604ec64d5092 /drivers/video/fbdev/hyperv_fb.c | |
| parent | Revert "usb: mtu3: fix up undefined reference to usb_debug_root" (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.gz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.xz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.zip | |
Merge 5.2-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/hyperv_fb.c')
| -rw-r--r-- | drivers/video/fbdev/hyperv_fb.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 403d8cd3e582..00f5bdcc6c6f 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -1,18 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2012, Microsoft Corporation. * * Author: * Haiyang Zhang <haiyangz@microsoft.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or - * NON INFRINGEMENT. See the GNU General Public License for more - * details. */ /* |