summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-23 12:32:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-23 12:32:14 -0700
commitdf2a8f39cdecdf59be797b9c86b26f90b37321e7 (patch)
treea1e4aac4e005e0faf578c96f1cc618ecd55ee6cb /Documentation
parenta4e71e7937461730998cef56cc924fe731b4d345 (diff)
parent888f2804e46377b54f283707f87c09922ef87eb2 (diff)
downloadlinux-df2a8f39cdecdf59be797b9c86b26f90b37321e7.tar.bz2
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "One bugfix for the tegra driver. Two updates regarding email addresses and MAINTAINERS which I like to have up-to-date so people can be reached immediately. While we are here, there is on PCI_ID addition." * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: add maintainer entry for atmel i2c driver i2c: Fix my e-mail address in drivers and documentation i2c: iSMT: add Intel Avoton DeviceIDs i2c: tegra: check the clk_prepare_enable() return value
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/i2c/busses/i2c-diolan-u2c2
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
-----------