diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 22:46:45 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 22:46:45 +0400 |
commit | b43f9b59e65e1d4ff06474885b44515817868fdd (patch) | |
tree | 0de0ca983a6624b0582034154da4d17a170caf1e /Documentation/i2c/busses/i2c-diolan-u2c | |
parent | c37b95eeefee32a765a9bbbfeaece48a361b2d23 (diff) | |
parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
download | linux-b43f9b59e65e1d4ff06474885b44515817868fdd.tar.xz |
Merge 3.9-rc5 into staging-next
This pulls in all of the good fixes we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 ----------- |