Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
              the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index f21a6171c691..c36d3a3d655f 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -6713,11 +6713,11 @@ static int airo_set_auth(struct net_device *dev,
                                 local->config.authType = AUTH_ENCRYPT;
                         } else
                                 return -EINVAL;
-                        break;
 
                         /* Commit the changes to flags if needed */
                         if (local->config.authType != currentAuthType)
                                 set_bit (FLAG_COMMIT, &local->flags);
+                        break;
                 }
 
         case IW_AUTH_WPA_ENABLED: