Merge branch 'devel-stable' into devel

[mv-sheeva.git] / drivers / net / wireless / atmel.c

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index a3b36b3a9d676a76194bc806d6776b714768fc95..cce188837d10b03daa42f1cf4209d6e334493d70 100644 (file)
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3330,7 +3330,7 @@ static void atmel_smooth_qual(struct atmel_private *priv)
        priv->wstats.qual.updated &= ~IW_QUAL_QUAL_INVALID;
 }
 
-/* deals with incoming managment frames. */
+/* deals with incoming management frames. */
 static void atmel_management_frame(struct atmel_private *priv,
                                   struct ieee80211_hdr *header,
                                   u16 frame_len, u8 rssi)