diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
| commit | bf5f48339a019c9b4b42284c3f45d58942cbda27 (patch) | |
| tree | 79976135166ffbdaf4ccb91bcadb17ddb551f060 /drivers/i2c/i2c-stub.c | |
| parent | d85dad75566674ca8012715ac00a84ced3697972 (diff) | |
| parent | 35582ad9d342025653aaf28ed321bf5352488d7f (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'drivers/i2c/i2c-stub.c')
| -rw-r--r-- | drivers/i2c/i2c-stub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-stub.c b/drivers/i2c/i2c-stub.c index d0a9c590c3c..77e4849d2f2 100644 --- a/drivers/i2c/i2c-stub.c +++ b/drivers/i2c/i2c-stub.c @@ -2,7 +2,7 @@ i2c-stub.c - I2C/SMBus chip emulator Copyright (c) 2004 Mark M. Hoffman <mhoffman@lightlink.com> - Copyright (C) 2007, 2012 Jean Delvare <khali@linux-fr.org> + Copyright (C) 2007, 2012 Jean Delvare <jdelvare@suse.de> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |