diff --git a/[refs] b/[refs]
index 1b39f7852689..a328661396f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c063af346d89be16e38385e55e5630070d6fd512
+refs/heads/master: f5fd5baee39fe941bd73973c63990d153184e3a1
diff --git a/trunk/drivers/bluetooth/hci_ath.c b/trunk/drivers/bluetooth/hci_ath.c
index 4093935ddf42..12172a6a95c4 100644
--- a/trunk/drivers/bluetooth/hci_ath.c
+++ b/trunk/drivers/bluetooth/hci_ath.c
@@ -112,7 +112,7 @@ static int ath_open(struct hci_uart *hu)
 
 	BT_DBG("hu %p", hu);
 
-	ath = kzalloc(sizeof(*ath), GFP_ATOMIC);
+	ath = kzalloc(sizeof(*ath), GFP_KERNEL);
 	if (!ath)
 		return -ENOMEM;