Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 7 insertions, 0 deletions

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 4616f468d599..1540f9c2fcf4 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -50,6 +50,13 @@ struct Qdisc {
 #define TCQ_F_INGRESS           2
 #define TCQ_F_CAN_BYPASS        4
 #define TCQ_F_MQROOT            8
+#define TCQ_F_ONETXQUEUE        0x10 /* dequeue_skb() can assume all skbs are for
+                                      * q->dev_queue : It can test
+                                      * netif_xmit_frozen_or_stopped() before
+                                      * dequeueing next packet.
+                                      * Its true for MQ/MQPRIO slaves, or non
+                                      * multiqueue device.
+                                      */
 #define TCQ_F_WARN_NONWC        (1 << 16)
         int                     padded;
         const struct Qdisc_ops  *ops;