diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/i2c/busses/i2c-xiic.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/i2c/busses/i2c-xiic.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-xiic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 9fbd7e6fe32e..e9d5ff4d1496 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * to the automotive development board Russellville. The copyright holder | 21 | * to the automotive development board Russellville. The copyright holder |
| 22 | * as seen in the header is Intel corporation. | 22 | * as seen in the header is Intel corporation. |
| 23 | * Mocean Laboratories forked off the GNU/Linux platform work into a | 23 | * Mocean Laboratories forked off the GNU/Linux platform work into a |
| 24 | * separate company called Pelagicore AB, which commited the code to the | 24 | * separate company called Pelagicore AB, which committed the code to the |
| 25 | * kernel. | 25 | * kernel. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||