diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-19 07:15:42 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-19 07:15:42 +0200 |
commit | 7ffc95e90e305c6803991ec2a2f4e442236efc77 (patch) | |
tree | 5018f8310d14bb4d8dd25813ae69827c557060a9 /drivers/i2c/busses/i2c-stm32.h | |
parent | usb: typec: fusb302: Call fusb302_debugfs_init earlier (diff) | |
parent | Linux 5.3-rc5 (diff) | |
download | linux-7ffc95e90e305c6803991ec2a2f4e442236efc77.tar.xz linux-7ffc95e90e305c6803991ec2a2f4e442236efc77.zip |
Merge 5.3-rc5 into usb-next
We need the usb fixes in here as well for other patches to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-stm32.h')
-rw-r--r-- | drivers/i2c/busses/i2c-stm32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-stm32.h b/drivers/i2c/busses/i2c-stm32.h index 868755f82f88..2c21893905a3 100644 --- a/drivers/i2c/busses/i2c-stm32.h +++ b/drivers/i2c/busses/i2c-stm32.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 */ /* * i2c-stm32.h * |