diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-04-13 20:14:37 +0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-04-13 20:14:37 +0200 |
commit | 473b2922c7e54260268c9bb037d2ff9f327422ab (patch) | |
tree | 40cee01f50cb0f285399c406ceba7b5acb58e486 /drivers/i2c/busses/i2c-exynos5.c | |
parent | perf vendor events amd: Add Zen3 events (diff) | |
parent | Merge tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
download | linux-473b2922c7e54260268c9bb037d2ff9f327422ab.tar.xz linux-473b2922c7e54260268c9bb037d2ff9f327422ab.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent that got into upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-exynos5.c')
-rw-r--r-- | drivers/i2c/busses/i2c-exynos5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 5ac30d95650c..97d4f3ac0abd 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/** +/* * i2c-exynos5.c - Samsung Exynos5 I2C Controller Driver * * Copyright (C) 2013 Samsung Electronics Co., Ltd. |