diff --git a/[refs] b/[refs]
index c105ee45f7a8..de96623f6d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 478fdf2bcef73747eb99bc6dd3565f093942647a
+refs/heads/master: b5a167942cb388cc5f1a6085cb3506d5bf47517d
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c b/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c
index 9931b197ff77..54a27200f3b6 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c
@@ -26,7 +26,8 @@
 #include "wl1251_cmd.h"
 #include "wl1251_io.h"
 
-#define WL1251_WAKEUP_TIMEOUT 2000
+/* in ms */
+#define WL1251_WAKEUP_TIMEOUT 100
 
 void wl1251_elp_work(struct work_struct *work)
 {