| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Apr 11 13:44:25 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Apr 11 13:44:25 2011 -0700 |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 [diff] [blame] | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 [diff] [blame] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/smsc911x.c
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 05a882e..b8faab7 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c
@@ -1669,7 +1669,7 @@ } if (e2cmd & E2P_CMD_EPC_TIMEOUT_) { - SMSC_TRACE(pdata, drv, "Error occured during eeprom operation"); + SMSC_TRACE(pdata, drv, "Error occurred during eeprom operation"); return -EINVAL; }