Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 3 insertions, 6 deletions

diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index fd9740466757..23357ab81a77 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-struct ifaddrmsg
-{
+struct ifaddrmsg {
         __u8            ifa_family;
         __u8            ifa_prefixlen;  /* The prefix length            */
         __u8            ifa_flags;      /* Flags                        */
@@ -20,8 +19,7 @@ struct ifaddrmsg
  * but for point-to-point IFA_ADDRESS is DESTINATION address,
  * local address is supplied in IFA_LOCAL attribute.
  */
-enum
-{
+enum {
         IFA_UNSPEC,
         IFA_ADDRESS,
         IFA_LOCAL,
@@ -47,8 +45,7 @@ enum
 #define IFA_F_TENTATIVE         0x40
 #define IFA_F_PERMANENT         0x80
 
-struct ifa_cacheinfo
-{
+struct ifa_cacheinfo {
         __u32   ifa_prefered;
         __u32   ifa_valid;
         __u32   cstamp; /* created timestamp, hundredths of seconds */