diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:42:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:42:51 +0200 |
| commit | 51fa228c8e05c58f51c97bbc571be94c4592a85e (patch) | |
| tree | 494028747238cf9edb0f6187f1bfaeccc762ceb0 /sound/soc/intel/common/soc-acpi-intel-skl-match.c | |
| parent | dt-bindings: usb: renesas_gen3: Rename bindings documentation file to reflect... (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-51fa228c8e05c58f51c97bbc571be94c4592a85e.tar.xz linux-51fa228c8e05c58f51c97bbc571be94c4592a85e.zip | |
Merge 5.3-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-skl-match.c')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-skl-match.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-skl-match.c b/sound/soc/intel/common/soc-acpi-intel-skl-match.c index 0c9c0edd35b3..42fa40a8d932 100644 --- a/sound/soc/intel/common/soc-acpi-intel-skl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-skl-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-skl-match.c - tables and support for SKL ACPI enumeration. + * soc-acpi-intel-skl-match.c - tables and support for SKL ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * |