diff --git a/[refs] b/[refs]
index c2779bd4890c..c87704e57200 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7ff737b6a783a6641dca71fab4f94aaab4bb2a
+refs/heads/master: 126f492355be8c771338b680b3dfbb38a19c88ab
diff --git a/trunk/drivers/net/wireless/mwifiex/uap_event.c b/trunk/drivers/net/wireless/mwifiex/uap_event.c
index 1703abf73dac..a33fa394e349 100644
--- a/trunk/drivers/net/wireless/mwifiex/uap_event.c
+++ b/trunk/drivers/net/wireless/mwifiex/uap_event.c
@@ -63,7 +63,7 @@ mwifiex_add_sta_entry(struct mwifiex_private *priv, u8 *mac)
 	if (node)
 		goto done;
 
-	node = kzalloc(sizeof(struct mwifiex_sta_node), GFP_KERNEL);
+	node = kzalloc(sizeof(struct mwifiex_sta_node), GFP_ATOMIC);
 	if (!node)
 		goto done;