diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-11-15 20:30:53 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-11-15 20:31:29 -0800 |
| commit | 617f41836c17688141e1c66f4156c2084f8ca86d (patch) | |
| tree | e57d631bb3bb061a0ff2e99bc85f94bd1c30598f /drivers/pinctrl/berlin/berlin-bg2q.c | |
| parent | 26add94cd535d1e000e7871fe69c7bb89e942d67 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
Merge v4.4-rc1 into MTD development
Sync up with the upstream development.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/pinctrl/berlin/berlin-bg2q.c')
| -rw-r--r-- | drivers/pinctrl/berlin/berlin-bg2q.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c index a466054a8206..cd171aea8ca8 100644 --- a/drivers/pinctrl/berlin/berlin-bg2q.c +++ b/drivers/pinctrl/berlin/berlin-bg2q.c @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Marvell Technology Group Ltd. * - * Antoine Ténart <antoine.tenart@free-electrons.com> + * Antoine Ténart <antoine.tenart@free-electrons.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -408,6 +408,6 @@ static struct platform_driver berlin2q_pinctrl_driver = { }; module_platform_driver(berlin2q_pinctrl_driver); -MODULE_AUTHOR("Antoine Ténart <antoine.tenart@free-electrons.com>"); +MODULE_AUTHOR("Antoine Ténart <antoine.tenart@free-electrons.com>"); MODULE_DESCRIPTION("Marvell Berlin BG2Q pinctrl driver"); MODULE_LICENSE("GPL"); |