diff --git a/[refs] b/[refs]
index 13d14cecba35..40b7c9072a5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fff7710937f755099209357e5b5740d42a2c9f97
+refs/heads/master: 16788599a9601cbba6ad7b58b3b52227ea59c013
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index b2cc552de738..447ff2ca4137 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -243,7 +243,7 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
 						station->tid[j].agg.wait_for_ba);
 				pos += sprintf(buf+pos, "%u\t%llu\t%u\n",
 						station->tid[j].agg.start_idx,
-						station->tid[j].agg.bitmap,
+						(unsigned long long)station->tid[j].agg.bitmap,
 						station->tid[j].agg.rate_n_flags);
 			}
 			pos += sprintf(buf+pos, "\n");