diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/i2c/busses/i2c-omap.c | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index e471e3bfdc1..89a30028ddb 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com> | 8 | * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com> |
| 9 | * Copyright (C) 2005 Nokia Corporation | 9 | * Copyright (C) 2005 Nokia Corporation |
| 10 | * | 10 | * |
| 11 | * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com> | 11 | * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com> |
| 12 | * | 12 | * |
| 13 | * This program is free software; you can redistribute it and/or modify | 13 | * This program is free software; you can redistribute it and/or modify |
| 14 | * it under the terms of the GNU General Public License as published by | 14 | * it under the terms of the GNU General Public License as published by |