diff --git a/[refs] b/[refs]
index cf8043db3d00..1112e8c7e3d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dde1bc0e6f86183bc095d0774cd109f4edf66ea2
+refs/heads/master: f5e5cb75539749960d7d35f8a7da29e2f4b96320
diff --git a/trunk/net/sched/sch_atm.c b/trunk/net/sched/sch_atm.c
index eb01aae117df..e58739153782 100644
--- a/trunk/net/sched/sch_atm.c
+++ b/trunk/net/sched/sch_atm.c
@@ -246,7 +246,7 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
 		if (!excess)
 			return -ENOENT;
 	}
-	pr_debug("atm_tc_change: type %d, payload %lu, hdr_len %d\n",
+	pr_debug("atm_tc_change: type %d, payload %d, hdr_len %d\n",
 		 opt->nla_type, nla_len(opt), hdr_len);
 	sock = sockfd_lookup(fd, &error);
 	if (!sock)