Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 46e382ed46aa..39a11e8af4fa 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -439,7 +439,7 @@ static u8 mac_reader[] = {
 };
 
 struct atmel_private {
-        void *card; /* Bus dependent stucture varies for PCcard */
+        void *card; /* Bus dependent structure varies for PCcard */
         int (*present_callback)(void *); /* And callback which uses it */
         char firmware_id[32];
         AtmelFWType firmware_type;
@@ -3895,7 +3895,7 @@ static int reset_atmel_card(struct net_device *dev)
 
            This routine is also responsible for initialising some
            hardware-specific fields in the atmel_private structure,
-           including a copy of the firmware's hostinfo stucture
+           including a copy of the firmware's hostinfo structure
            which is the route into the rest of the firmware datastructures. */
 
         struct atmel_private *priv = netdev_priv(dev);