diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 23:32:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 23:32:13 +0100 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/infiniband/hw/qib/qib_twsi.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_twsi.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_twsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_twsi.c b/drivers/infiniband/hw/qib/qib_twsi.c index 6f31ca5039db..ddde72e11edb 100644 --- a/drivers/infiniband/hw/qib/qib_twsi.c +++ b/drivers/infiniband/hw/qib/qib_twsi.c @@ -41,7 +41,7 @@ * QLogic_IB "Two Wire Serial Interface" driver. * Originally written for a not-quite-i2c serial eeprom, which is * still used on some supported boards. Later boards have added a - * variety of other uses, most board-specific, so teh bit-boffing + * variety of other uses, most board-specific, so the bit-boffing * part has been split off to this file, while the other parts * have been moved to chip-specific files. * |