diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
commit | 6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch) | |
tree | c250644c5adce04947d664318996de16df3f02da /Documentation/i2c/busses/i2c-diolan-u2c | |
parent | b96516220870d8571fc12da980668687c122976e (diff) | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/i2c/busses/i2c-diolan-u2c')
-rw-r--r-- | Documentation/i2c/busses/i2c-diolan-u2c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/busses/i2c-diolan-u2c b/Documentation/i2c/busses/i2c-diolan-u2c index 30fe4bb9a069..0d6018c316c7 100644 --- a/Documentation/i2c/busses/i2c-diolan-u2c +++ b/Documentation/i2c/busses/i2c-diolan-u2c @@ -5,7 +5,7 @@ Supported adapters: Documentation: http://www.diolan.com/i2c/u2c12.html -Author: Guenter Roeck <guenter.roeck@ericsson.com> +Author: Guenter Roeck <linux@roeck-us.net> Description ----------- |