Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index c6f51ad52d5b..06fcdb45106b 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -25,6 +25,7 @@ struct in_device
         struct in_ifaddr        *ifa_list;      /* IP ifaddr chain              */
         rwlock_t                mc_list_lock;
         struct ip_mc_list       *mc_list;       /* IP multicast filter chain    */
+        int                     mc_count;                 /* Number of installed mcasts */
         spinlock_t              mc_tomb_lock;
         struct ip_mc_list       *mc_tomb;
         unsigned long           mr_v1_seen;