ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 3031ed9c4a1a..296486bf0956 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -115,7 +115,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
                           0x02,       /* phy reset sequence length */
                           0x01, 0x00, /* phy reset sequence */
                           0x00, 0x78, /* media capabilities */
-                          0x00, 0xe0, /* nway advertisment */
+                          0x00, 0xe0, /* nway advertisement */
                           0x00, 0x05, /* fdx bit map */
                           0x00, 0x06  /* ttm bit map */
                         };