From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Apr 2011 20:44:25 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.0-rc1~377^2~457
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1c01a80cfec6f806246f31ff2680cd3639b30e67;p=linux-2.6-block.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c
---

1c01a80cfec6f806246f31ff2680cd3639b30e67
diff --cc drivers/net/smsc911x.c
index 05a882e6e139,4b42ecc63dcf..b8faab7780da
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@@ -1669,7 -1669,7 +1669,7 @@@ static int smsc911x_eeprom_send_cmd(str
  	}
  
  	if (e2cmd & E2P_CMD_EPC_TIMEOUT_) {
- 		SMSC_TRACE(pdata, drv, "Error occured during eeprom operation");
 -		SMSC_TRACE(DRV, "Error occurred during eeprom operation");
++		SMSC_TRACE(pdata, drv, "Error occurred during eeprom operation");
  		return -EINVAL;
  	}