Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 2 insertions, 4 deletions

diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h
index 0a99ab60d610..7561750e8fd6 100644
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/linux/tc_act/tc_mirred.h
@@ -10,15 +10,13 @@
 #define TCA_INGRESS_REDIR 3  /* packet redirect to INGRESS*/
 #define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */
                                                                                 
-struct tc_mirred
-{
+struct tc_mirred {
         tc_gen;
         int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
         __u32                   ifindex;  /* ifindex of egress port */
 };
                                                                                 
-enum
-{
+enum {
         TCA_MIRRED_UNSPEC,
         TCA_MIRRED_TM,
         TCA_MIRRED_PARMS,