Merge tag 'v5.2-rc6' into asoc-5.3

Linux 5.2-rc6
This commit is contained in:
Mark Brown
2019-06-26 12:39:34 +01:00
کامیت 53c8b29abe
22568فایلهای تغییر یافته به همراه38091 افزوده شده و 153957 حذف شده

مشاهده پرونده

@@ -1,19 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* ASoC machine driver for Intel Broadwell platforms with RT5677 codec
*
* Copyright (c) 2014, The Chromium OS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <linux/acpi.h>