Merge branch 'master' into net-next

include/SNAPSHOT.h

-static const char SNAPSHOT[] = "150413";
+static const char SNAPSHOT[] = "150626";

man/man8/Makefile

 TARGETS = ip-address.8 ip-link.8 ip-route.8
 
 MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 ss.8 \
-	tc.8 tc-bfifo.8 tc-cbq.8 tc-cbq-details.8 tc-choke.8 tc-codel.8 \
+	tc.8 tc-bfifo.8 tc-bpf.8 tc-cbq.8 tc-cbq-details.8 tc-choke.8 tc-codel.8 \
 	tc-drr.8 tc-ematch.8 tc-fq_codel.8 tc-hfsc.8 tc-htb.8 tc-pie.8 \
 	tc-mqprio.8 tc-netem.8 tc-pfifo.8 tc-pfifo_fast.8 tc-prio.8 tc-red.8 \
 	tc-sfb.8 tc-sfq.8 tc-stab.8 tc-tbf.8 \

man/man8/tc.8

@@ -558,6 +558,7 @@ Shows classes as ASCII graph with stats info under each class.
 was written by Alexey N. Kuznetsov and added in Linux 2.2.
 .SH SEE ALSO
 .BR tc-bfifo (8),
+.BR tc-bpf (8),
 .BR tc-cbq (8),
 .BR tc-choke (8),
 .BR tc-codel (8),