Merge tag 'v5.2-rc4' into regulator-5.3

Linux 5.2-rc4
This commit is contained in:
Mark Brown
2019-06-18 19:12:47 +01:00
17247 changed files with 26668 additions and 125944 deletions

View File

@@ -1,15 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* include/linux/mfd/wm831x/pdata.h -- Platform data for WM831x
*
* Copyright 2009 Wolfson Microelectronics PLC.
*
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
*
* 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.
*
*/
#ifndef __MFD_WM831X_PDATA_H__