diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
| commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 (patch) | |
| tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 /Documentation/hwmon/lm25066 | |
| parent | a4339a9cb46644e19278e4dd5d89b262a37cb0b0 (diff) | |
| parent | 8585deb18580d04209a2986430aa0959ef38fce2 (diff) | |
| download | talos-obmc-linux-809609a5d8427b0025304dbb69a84a692d11c4f9.tar.gz talos-obmc-linux-809609a5d8427b0025304dbb69a84a692d11c4f9.zip | |
Merge branch 'soc' into pinmux-base
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Diffstat (limited to 'Documentation/hwmon/lm25066')
| -rw-r--r-- | Documentation/hwmon/lm25066 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/lm25066 b/Documentation/hwmon/lm25066 index a21db81c4591..26025e419d35 100644 --- a/Documentation/hwmon/lm25066 +++ b/Documentation/hwmon/lm25066 @@ -19,7 +19,7 @@ Supported chips: Datasheet: http://www.national.com/pf/LM/LM5066.html -Author: Guenter Roeck <guenter.roeck@ericsson.com> +Author: Guenter Roeck <linux@roeck-us.net> Description |
