Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts: net/mac80211/rate.c
2010-02-14 22:30:54 -08:00
parent f6f223039c 3d0beb921f
commit 5ecccb74dc
10 changed files with 36 additions and 31 deletions
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -320,7 +320,7 @@ static int qt202x_reset_phy(struct efx_nic *efx)

 	falcon_board(efx)->type->init_phy(efx);

-	return rc;
+	return 0;

 fail:
 	EFX_ERR(efx, "PHY reset timed out\n");