diff --git a/[refs] b/[refs]
index 02029596f990..f1e1c1558ace 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4771afb56930d6b03a04fa231f06ae29c3a496de
+refs/heads/master: ba8007ceb076f336a453a049cc5353eaa01d7136
diff --git a/trunk/drivers/net/wireless/p54common.c b/trunk/drivers/net/wireless/p54common.c
index 2c63cf0ad2cd..1437db0cf4b2 100644
--- a/trunk/drivers/net/wireless/p54common.c
+++ b/trunk/drivers/net/wireless/p54common.c
@@ -577,7 +577,7 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type,
 	struct p54_tx_control_filter *filter;
 
 	hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) +
-		      priv->tx_hdr_len, GFP_KERNEL);
+		      priv->tx_hdr_len, GFP_ATOMIC);
 	if (!hdr)
 		return -ENOMEM;