|author||Jiri Kosina <email@example.com>||2011-04-26 10:22:15 +0200|
|committer||Jiri Kosina <firstname.lastname@example.org>||2011-04-26 10:22:59 +0200|
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/i2c/busses/i2c-ali15x3.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index b14f6d68221..83e8a60cdc8 100644
@@ -318,7 +318,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
Unfortunately the ALI SMB controller maps "no response" and "bus
- collision" into a single bit. No reponse is the usual case so don't
+ collision" into a single bit. No response is the usual case so don't
do a printk.
This means that bus collisions go unreported.